diff --git a/customer_ftp.php b/customer_ftp.php
index cafe5370..5cc532d4 100644
--- a/customer_ftp.php
+++ b/customer_ftp.php
@@ -204,7 +204,8 @@ elseif($page == 'accounts')
if($sendinfomail == 1)
{
$replace_arr = array(
- 'CUST_NAME' => getCorrectUserSalutation($userinfo),
+ 'SALUTATION' => getCorrectUserSalutation($userinfo),
+ 'CUST_NAME' => getCorrectUserSalutation($userinfo), // < keep this for compatibility
'USR_NAME' => $username,
'USR_PASS' => $password,
'USR_PATH' => makeCorrectDir(substr($path, strlen($userinfo['documentroot'])))
diff --git a/customer_mysql.php b/customer_mysql.php
index af17a534..cb0776bc 100644
--- a/customer_mysql.php
+++ b/customer_mysql.php
@@ -228,7 +228,8 @@ elseif($page == 'mysqls')
}
$replace_arr = array(
- 'CUST_NAME' => getCorrectUserSalutation($userinfo),
+ 'SALUTATION' => getCorrectUserSalutation($userinfo),
+ 'CUST_NAME' => getCorrectUserSalutation($userinfo), // < keep this for compatibility
'DB_NAME' => $username,
'DB_PASS' => $password,
'DB_DESC' => $databasedescription,
diff --git a/scripts/jobs/cron_usage.inc.diskspace.php b/scripts/jobs/cron_usage.inc.diskspace.php
index 7ce5a9e7..7c65bd98 100644
--- a/scripts/jobs/cron_usage.inc.diskspace.php
+++ b/scripts/jobs/cron_usage.inc.diskspace.php
@@ -19,7 +19,7 @@
* report about diskusage for customers
*/
$result = $db->query("SELECT
- `c`.`customerid`, `c`.`adminid`, `c`.`name`, `c`.`firstname`, `c`.`diskspace`,
+ `c`.`customerid`, `c`.`adminid`, `c`.`name`, `c`.`firstname`, `c`.`company`, `c`.`diskspace`,
`c`.`diskspace_used`, `c`.`email`, `c`.`def_language`,
`a`.`name` AS `adminname`, `a`.`email` AS `adminmail`
FROM `" . TABLE_PANEL_CUSTOMERS . "` AS `c`
@@ -35,8 +35,14 @@ while($row = $db->fetch_array($result))
&& (($row['diskspace_used'] * 100) / $row['diskspace']) >= (int)$settings['system']['report_webmax']
) {
+ $rep_userinfo = array(
+ 'name' => $row['name'],
+ 'firstname' => $row['firstname'],
+ 'company' => $row['company']
+ );
$replace_arr = array(
- 'NAME' => $row['name'],
+ 'SALUTATION' => getCorrectUserSalutation($rep_userinfo),
+ 'NAME' => $row['name'], // < keep this for compatibility
'DISKAVAILABLE' => round(($row['diskspace'] / 1024), 2), /* traffic is stored in KB, template uses MB */
'DISKUSED' => round($row['diskspace_used'] / 1024, 2), /* traffic is stored in KB, template uses MB */
'USAGE_PERCENT' => round(($row['diskspace_used'] * 100) / $row['diskspace'], 2),
diff --git a/scripts/jobs/cron_usage_report.php b/scripts/jobs/cron_usage_report.php
index d3cd25e3..a4c13d23 100644
--- a/scripts/jobs/cron_usage_report.php
+++ b/scripts/jobs/cron_usage_report.php
@@ -30,7 +30,7 @@ $mail->SetFrom($settings['panel']['adminmail'], 'Froxlor Administrator');
// Warn the customers at xx% traffic-usage
-$result = $db->query("SELECT `c`.`customerid`, `c`.`adminid`, `c`.`name`, `c`.`firstname`, `c`.`traffic`,
+$result = $db->query("SELECT `c`.`customerid`, `c`.`adminid`, `c`.`name`, `c`.`firstname`, `c`.`company`, `c`.`traffic`,
`c`.`email`, `c`.`def_language`, `a`.`name` AS `adminname`, `a`.`email` AS `adminmail`,
(SELECT SUM(`t`.`http` + `t`.`ftp_up` + `t`.`ftp_down` + `t`.`mail`)
FROM `" . TABLE_PANEL_TRAFFIC . "` `t`
@@ -47,8 +47,14 @@ while($row = $db->fetch_array($result))
&& $row['traffic_used'] != NULL
&& (($row['traffic_used'] * 100) / $row['traffic']) >= (int)$settings['system']['report_trafficmax'])
{
+ $rep_userinfo = array(
+ 'name' => $row['name'],
+ 'firstname' => $row['firstname'],
+ 'company' => $row['company']
+ );
$replace_arr = array(
- 'NAME' => $row['name'],
+ 'SALUTATION' => getCorrectUserSalutation($rep_userinfo),
+ 'NAME' => $row['name'], // < keep this for compatibility
'TRAFFIC' => round(($row['traffic'] / 1024), 2), /* traffic is stored in KB, template uses MB */
'TRAFFICUSED' => round(($row['traffic_used'] / 1024), 2), /* traffic is stored in KB, template uses MB */
'USAGE_PERCENT' => round(($row['traffic_used'] * 100) / $row['traffic'], 2),
diff --git a/templates/Froxlor/admin/templates/templates_add_2.tpl b/templates/Froxlor/admin/templates/templates_add_2.tpl
index 4109f20a..2fa2ce77 100644
--- a/templates/Froxlor/admin/templates/templates_add_2.tpl
+++ b/templates/Froxlor/admin/templates/templates_add_2.tpl
@@ -123,6 +123,10 @@ $header
{$lng['admin']['templates']['trafficmaxpercent']}
+
+ | {SALUTATION} |
+ {$lng['admin']['templates']['SALUTATION']} |
+
| {TRAFFIC} |
{$lng['admin']['templates']['TRAFFIC']} |
@@ -144,6 +148,10 @@ $header
{$lng['admin']['templates']['diskmaxpercent']}
+
+ | {SALUTATION} |
+ {$lng['admin']['templates']['SALUTATION']} |
+
| {DISKAVAILABLE} |
{$lng['admin']['templates']['DISKAVAILABLE']} |
@@ -191,8 +199,8 @@ $header
- | {CUST_NAME} |
- {$lng['admin']['templates']['CUST_NAME']} |
+ {SALUTATION} |
+ {$lng['admin']['templates']['SALUTATION']} |
| {DB_NAME} |
@@ -220,8 +228,8 @@ $header
- | {CUST_NAME} |
- {$lng['admin']['templates']['CUST_NAME']} |
+ {SALUTATION} |
+ {$lng['admin']['templates']['SALUTATION']} |
| {USR_NAME} |
diff --git a/templates/Froxlor/admin/templates/templates_edit.tpl b/templates/Froxlor/admin/templates/templates_edit.tpl
index 5be76d23..9ea66452 100644
--- a/templates/Froxlor/admin/templates/templates_edit.tpl
+++ b/templates/Froxlor/admin/templates/templates_edit.tpl
@@ -124,6 +124,10 @@ $header
{$lng['admin']['templates']['trafficmaxpercent']}
+
+ | {SALUTATION} |
+ {$lng['admin']['templates']['SALUTATION']} |
+
| {TRAFFIC} |
{$lng['admin']['templates']['TRAFFIC']} |
@@ -145,6 +149,10 @@ $header
{$lng['admin']['templates']['diskmaxpercent']}
+
+ | {SALUTATION} |
+ {$lng['admin']['templates']['SALUTATION']} |
+
| {DISKAVAILABLE} |
{$lng['admin']['templates']['DISKAVAILABLE']} |
@@ -192,8 +200,8 @@ $header
- | {CUST_NAME} |
- {$lng['admin']['templates']['CUST_NAME']} |
+ {SALUTATION} |
+ {$lng['admin']['templates']['SALUTATION']} |
| {DB_NAME} |
@@ -221,8 +229,8 @@ $header
- | {CUST_NAME} |
- {$lng['admin']['templates']['CUST_NAME']} |
+ {SALUTATION} |
+ {$lng['admin']['templates']['SALUTATION']} |
| {USR_NAME} |