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

- fix usage of template 'diskspace usage', fixes #656

Browse Source 
- added missing template-variables to view, fixes #651
This commit is contained in:
Michael Kaufmann (d00p)
2011-03-14 08:40:00 +01:00
parent 24838ec2cf
commit 240025a183
7 changed files with 136 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/jobs/cron_usage.inc.diskspace.php
View File

@@ -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;

27
templates/Classic/admin/templates/templates_add_2.tpl
View File

@@ -106,6 +106,33 @@ $header
<td class="field_name_border_left"><i>{TRAFFICUSED}</i>:</td>
<td class="field_name">{$lng['admin']['templates']['TRAFFICUSED']}</td>
</tr>
<tr>
<td class="field_name_border_left"><i>{MAX_PERCENT}</i>:</td>
<td class="field_name">{$lng['admin']['templates']['MAX_PERCENT']}</td>
</tr>
<tr>
<td class="field_name_border_left"><i>{USAGE_PERCENT}</i>:</td>
<td class="field_name">{$lng['admin']['templates']['USAGE_PERCENT']}</td>
</tr>
<tr>
<td class="field_display_border_left" colspan="2"><b>{$lng['admin']['templates']['diskmaxpercent']}</b></td>
</tr>
<tr>
<td class="field_name_border_left"><i>{DISKAVAILABLE}</i>:</td>
<td class="field_name">{$lng['admin']['templates']['DISKAVAILABLE']}</td>
</tr>
<tr>
<td class="field_name_border_left"><i>{DISKUSED}</i>:</td>
<td class="field_name">{$lng['admin']['templates']['DISKUSED']}</td>
</tr>
<tr>
<td class="field_name_border_left"><i>{MAX_PERCENT}</i>:</td>
<td class="field_name">{$lng['admin']['templates']['MAX_PERCENT']}</td>
</tr>
<tr>
<td class="field_name_border_left"><i>{USAGE_PERCENT}</i>:</td>
<td class="field_name">{$lng['admin']['templates']['USAGE_PERCENT']}</td>
</tr>
<tr>
<td class="field_display_border_left" colspan="2"><b>{$lng['admin']['templates']['ticket']}</b></td>
</tr>

27
templates/Classic/admin/templates/templates_edit.tpl
View File

@@ -108,6 +108,33 @@ $header
<td class="field_name_border_left"><i>{TRAFFICUSED}</i>:</td>
<td class="field_name">{$lng['admin']['templates']['TRAFFICUSED']}</td>
</tr>
<tr>
<td class="field_name_border_left"><i>{MAX_PERCENT}</i>:</td>
<td class="field_name">{$lng['admin']['templates']['MAX_PERCENT']}</td>
</tr>
<tr>
<td class="field_name_border_left"><i>{USAGE_PERCENT}</i>:</td>
<td class="field_name">{$lng['admin']['templates']['USAGE_PERCENT']}</td>
</tr>
<tr>
<td class="field_display_border_left" colspan="2"><b>{$lng['admin']['templates']['diskmaxpercent']}</b></td>
</tr>
<tr>
<td class="field_name_border_left"><i>{DISKAVAILABLE}</i>:</td>
<td class="field_name">{$lng['admin']['templates']['DISKAVAILABLE']}</td>
</tr>
<tr>
<td class="field_name_border_left"><i>{DISKUSED}</i>:</td>
<td class="field_name">{$lng['admin']['templates']['DISKUSED']}</td>
</tr>
<tr>
<td class="field_name_border_left"><i>{MAX_PERCENT}</i>:</td>
<td class="field_name">{$lng['admin']['templates']['MAX_PERCENT']}</td>
</tr>
<tr>
<td class="field_name_border_left"><i>{USAGE_PERCENT}</i>:</td>
<td class="field_name">{$lng['admin']['templates']['USAGE_PERCENT']}</td>
</tr>
<tr>
<td class="field_display_border_left" colspan="2"><b>{$lng['admin']['templates']['ticket']}</b></td>
</tr>

19
templates/Froxlor/admin/admins/admins_admin.tpl
View File

@@ -14,7 +14,24 @@
Webspace:&nbsp;
<if $row['diskspace'] != 'UL'>
<span class="progressBar" title="{$row['diskspace_used']} / {$row['diskspace']} MB">
<if (($row['diskspace']/100)*90) < $row['diskspace_used']>
<if (($row['diskspace']/100)*(int)$settings['system']['report_webmax']) < $row['diskspace_used']>
<span class="redbar">
<else>
<span>
</if>
<em style="left: {$doublepercent}px;">{$percent}%</em></span>
</span>
<else>
<span class="progressBar" title="{$lng['customer']['unlimited']}">
<span class="greybar"><em style="left: 200px;">100%</em></span>
</span>
</if>
</span>
<span class="overviewcustomerextras">
Traffic:&nbsp;
<if $row['traffic'] != 'UL'>
<span class="progressBar" title="{$row['traffic_used']} / {$row['traffic']} GB">
<if (($row['traffic']/100)*(int)$settings['system']['report_trafficmax']) < $row['traffic_used']>
<span class="redbar">
<else>
<span>

4
templates/Froxlor/admin/customers/customers_customer.tpl
View File

@@ -14,7 +14,7 @@
Webspace:&nbsp;
<if $row['diskspace'] != 'UL'>
<span class="progressBar" title="{$row['diskspace_used']} / {$row['diskspace']} MB">
<if (($row['diskspace']/100)*90) < $row['diskspace_used']>
<if (($row['diskspace']/100)*(int)$settings['system']['report_webmax']) < $row['diskspace_used']>
<span class="redbar">
<else>
<span>
@@ -31,7 +31,7 @@
Traffic:&nbsp;
<if $row['traffic'] != 'UL'>
<span class="progressBar" title="{$row['traffic_used']} / {$row['traffic']} GB">
<if (($row['traffic']/100)*90) < $row['traffic_used']>
<if (($row['traffic']/100)*(int)$settings['system']['report_trafficmax']) < $row['traffic_used']>
<span class="redbar">
<else>
<span>

29
templates/Froxlor/admin/templates/templates_add_2.tpl
View File

@@ -131,6 +131,35 @@ $header
<td><em>{TRAFFICUSED}</em>:</td>
<td>{$lng['admin']['templates']['TRAFFICUSED']}</td>
</tr>
<tr>
<td><em>{MAX_PERCENT}</em>:</td>
<td>{$lng['admin']['templates']['MAX_PERCENT']}</td>
</tr>
<tr>
<td><em>{USAGE_PERCENT}</em>:</td>
<td>{$lng['admin']['templates']['USAGE_PERCENT']}</td>
</tr>
<tr>
<td colspan="2">
<strong>{$lng['admin']['templates']['diskmaxpercent']}</strong>
</td>
</tr>
<tr>
<td><em>{DISKAVAILABLE}</em>:</td>
<td>{$lng['admin']['templates']['DISKAVAILABLE']}</td>
</tr>
<tr>
<td><em>{DISKUSED}</em>:</td>
<td>{$lng['admin']['templates']['DISKUSED']}</td>
</tr>
<tr>
<td><em>{MAX_PERCENT}</em>:</td>
<td>{$lng['admin']['templates']['MAX_PERCENT']}</td>
</tr>
<tr>
<td><em>{USAGE_PERCENT}</em>:</td>
<td>{$lng['admin']['templates']['USAGE_PERCENT']}</td>
</tr>
<tr>
<td colspan="2">
<strong>{$lng['admin']['templates']['ticket']}</strong>

29
templates/Froxlor/admin/templates/templates_edit.tpl
View File

@@ -132,6 +132,35 @@ $header
<td><em>{TRAFFICUSED}</em>:</td>
<td>{$lng['admin']['templates']['TRAFFICUSED']}</td>
</tr>
<tr>
<td><em>{MAX_PERCENT}</em>:</td>
<td>{$lng['admin']['templates']['MAX_PERCENT']}</td>
</tr>
<tr>
<td><em>{USAGE_PERCENT}</em>:</td>
<td>{$lng['admin']['templates']['USAGE_PERCENT']}</td>
</tr>
<tr>
<td colspan="2">
<strong>{$lng['admin']['templates']['diskmaxpercent']}</strong>
</td>
</tr>
<tr>
<td><em>{DISKAVAILABLE}</em>:</td>
<td>{$lng['admin']['templates']['DISKAVAILABLE']}</td>
</tr>
<tr>
<td><em>{DISKUSED}</em>:</td>
<td>{$lng['admin']['templates']['DISKUSED']}</td>
</tr>
<tr>
<td><em>{MAX_PERCENT}</em>:</td>
<td>{$lng['admin']['templates']['MAX_PERCENT']}</td>
</tr>
<tr>
<td><em>{USAGE_PERCENT}</em>:</td>
<td>{$lng['admin']['templates']['USAGE_PERCENT']}</td>
</tr>
<tr>
<td colspan="2">
<strong>{$lng['admin']['templates']['ticket']}</strong>