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

provide a correct user-salutation for all templates, thanks to Shortie

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2013-04-19 11:56:53 +02:00
parent e97a7c611c
commit 1ae7876e44
6 changed files with 44 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
customer_ftp.php
View File

@@ -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'])))

3
customer_mysql.php
View File

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

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

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

10
scripts/jobs/cron_usage_report.php
View File

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

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

@@ -123,6 +123,10 @@ $header
<strong>{$lng['admin']['templates']['trafficmaxpercent']}</strong>
</td>
</tr>
<tr>
<td><em>{SALUTATION}</em></td>
<td>{$lng['admin']['templates']['SALUTATION']}</td>
</tr>
<tr>
<td><em>{TRAFFIC}</em></td>
<td>{$lng['admin']['templates']['TRAFFIC']}</td>
@@ -144,6 +148,10 @@ $header
<strong>{$lng['admin']['templates']['diskmaxpercent']}</strong>
</td>
</tr>
<tr>
<td><em>{SALUTATION}</em></td>
<td>{$lng['admin']['templates']['SALUTATION']}</td>
</tr>
<tr>
<td><em>{DISKAVAILABLE}</em></td>
<td>{$lng['admin']['templates']['DISKAVAILABLE']}</td>
@@ -191,8 +199,8 @@ $header
</td>
</tr>
<tr>
<td><em>{CUST_NAME}</em></td>
<td>{$lng['admin']['templates']['CUST_NAME']}</td>
<td><em>{SALUTATION}</em></td>
<td>{$lng['admin']['templates']['SALUTATION']}</td>
</tr>
<tr>
<td><em>{DB_NAME}</em></td>
@@ -220,8 +228,8 @@ $header
</td>
</tr>
<tr>
<td><em>{CUST_NAME}</em></td>
<td>{$lng['admin']['templates']['CUST_NAME']}</td>
<td><em>{SALUTATION}</em></td>
<td>{$lng['admin']['templates']['SALUTATION']}</td>
</tr>
<tr>
<td><em>{USR_NAME}</em></td>

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

@@ -124,6 +124,10 @@ $header
<strong>{$lng['admin']['templates']['trafficmaxpercent']}</strong>
</td>
</tr>
<tr>
<td><em>{SALUTATION}</em></td>
<td>{$lng['admin']['templates']['SALUTATION']}</td>
</tr>
<tr>
<td><em>{TRAFFIC}</em></td>
<td>{$lng['admin']['templates']['TRAFFIC']}</td>
@@ -145,6 +149,10 @@ $header
<strong>{$lng['admin']['templates']['diskmaxpercent']}</strong>
</td>
</tr>
<tr>
<td><em>{SALUTATION}</em></td>
<td>{$lng['admin']['templates']['SALUTATION']}</td>
</tr>
<tr>
<td><em>{DISKAVAILABLE}</em></td>
<td>{$lng['admin']['templates']['DISKAVAILABLE']}</td>
@@ -192,8 +200,8 @@ $header
</td>
</tr>
<tr>
<td><em>{CUST_NAME}</em></td>
<td>{$lng['admin']['templates']['CUST_NAME']}</td>
<td><em>{SALUTATION}</em></td>
<td>{$lng['admin']['templates']['SALUTATION']}</td>
</tr>
<tr>
<td><em>{DB_NAME}</em></td>
@@ -221,8 +229,8 @@ $header
</td>
</tr>
<tr>
<td><em>{CUST_NAME}</em></td>
<td>{$lng['admin']['templates']['CUST_NAME']}</td>
<td><em>{SALUTATION}</em></td>
<td>{$lng['admin']['templates']['SALUTATION']}</td>
</tr>
<tr>
<td><em>{USR_NAME}</em></td>