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

- added missing template-variables to view, fixes #651

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;

templates/Classic/admin/templates/templates_add_2.tpl

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

templates/Classic/admin/templates/templates_edit.tpl

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

templates/Froxlor/admin/admins/admins_admin.tpl

@@ -14,7 +14,24 @@
 				Webspace: 
 				<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>

templates/Froxlor/admin/customers/customers_customer.tpl

@@ -14,7 +14,7 @@
 				Webspace: 
 				<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>

templates/Froxlor/admin/templates/templates_add_2.tpl

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

templates/Froxlor/admin/templates/templates_edit.tpl

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