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

- add possibility to define email templates for "new database by customer" and "new ftp account by customer"

Browse Source
This commit is contained in:
Michael Kaufmann (d00p)
2010-08-10 09:21:07 +00:00
parent 599d179c4d
commit ee29c406ab
7 changed files with 164 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
admin_templates.php
View File

@@ -53,7 +53,9 @@ $available_templates = array(
'new_ticket_for_customer',
'new_ticket_by_staff',
'new_reply_ticket_by_customer',
'new_reply_ticket_by_staff'
'new_reply_ticket_by_staff',
'new_database_by_customer',
'new_ftpaccount_by_customer'
);
$file_templates = array(
'index_html'

8
customer_ftp.php
View File

@@ -212,11 +212,15 @@ elseif($page == 'accounts')
'USR_PATH' => makeCorrectDir(substr($path, strlen($userinfo['documentroot'])))
);
$mail_body = replace_variables($lng['customer']['ftp_add']['infomail_body']['main'], $replace_arr);
$def_language = $userinfo['def_language'];
$result = $db->query_first('SELECT `value` FROM `' . TABLE_PANEL_TEMPLATES . '` WHERE `adminid`=\'' . (int)$userinfo['adminid'] . '\' AND `language`=\'' . $db->escape($def_language) . '\' AND `templategroup`=\'mails\' AND `varname`=\'new_ftpaccount_by_customer_subject\'');
$mail_subject = html_entity_decode(replace_variables((($result['value'] != '') ? $result['value'] : $lng['customer']['ftp_add']['infomail_subject']), $replace_arr));
$result = $db->query_first('SELECT `value` FROM `' . TABLE_PANEL_TEMPLATES . '` WHERE `adminid`=\'' . (int)$userinfo['adminid'] . '\' AND `language`=\'' . $db->escape($def_language) . '\' AND `templategroup`=\'mails\' AND `varname`=\'new_ftpaccount_by_customer_mailbody\'');
$mail_body = html_entity_decode(replace_variables((($result['value'] != '') ? $result['value'] : $lng['customer']['ftp_add']['infomail_body']['main']), $replace_arr));
$_mailerror = false;
try {
$mail->Subject = $lng['customer']['ftp_add']['infomail_subject'];
$mail->Subject = $mail_subject;
$mail->AltBody = $mail_body;
$mail->MsgHTML(str_replace("\n", "<br />", $mail_body));
$mail->AddAddress($userinfo['email'], getCorrectUserSalutation($userinfo));

15
customer_mysql.php
View File

@@ -194,11 +194,10 @@ elseif($page == 'mysqls')
if($sendinfomail == 1)
{
$pma = '';
$pma = $lng['admin']['notgiven'];
if($settings['panel']['phpmyadmin_url'] != '')
{
$r_arr = array('URI' => $settings['panel']['phpmyadmin_url']);
$pma = replace_variables($lng['customer']['mysql_add']['infomail_body']['pma'], $r_arr);
$pma = $settings['panel']['phpmyadmin_url'];
}
$replace_arr = array(
@@ -210,11 +209,15 @@ elseif($page == 'mysqls')
'PMA_URI' => $pma
);
$mail_body = replace_variables($lng['customer']['mysql_add']['infomail_body']['main'], $replace_arr);
$def_language = $userinfo['def_language'];
$result = $db->query_first('SELECT `value` FROM `' . TABLE_PANEL_TEMPLATES . '` WHERE `adminid`=\'' . (int)$userinfo['adminid'] . '\' AND `language`=\'' . $db->escape($def_language) . '\' AND `templategroup`=\'mails\' AND `varname`=\'new_database_by_customer_subject\'');
$mail_subject = html_entity_decode(replace_variables((($result['value'] != '') ? $result['value'] : $lng['customer']['mysql_add']['infomail_subject']), $replace_arr));
$result = $db->query_first('SELECT `value` FROM `' . TABLE_PANEL_TEMPLATES . '` WHERE `adminid`=\'' . (int)$userinfo['adminid'] . '\' AND `language`=\'' . $db->escape($def_language) . '\' AND `templategroup`=\'mails\' AND `varname`=\'new_database_by_customer_mailbody\'');
$mail_body = html_entity_decode(replace_variables((($result['value'] != '') ? $result['value'] : $lng['customer']['mysql_add']['infomail_body']['main']), $replace_arr));
$_mailerror = false;
try {
$mail->Subject = $lng['customer']['mysql_add']['infomail_subject'];
$mail->Subject = $mail_subject;
$mail->AltBody = $mail_body;
$mail->MsgHTML(str_replace("\n", "<br />", $mail_body));
$mail->AddAddress($userinfo['email'], getCorrectUserSalutation($userinfo));

17
lng/english.lng.php
View File

@@ -1354,8 +1354,7 @@ $lng['ftp']['account_edit'] = 'Edit ftp account';
$lng['ftp']['editpassdescription'] = 'Set new password or leave blank for no change.';
$lng['customer']['sendinfomail'] = 'Send data via email to me';
$lng['customer']['mysql_add']['infomail_subject'] = '[Froxlor] New database created';
$lng['customer']['mysql_add']['infomail_body']['pma'] = "\nYou can access your databases using phpMyAdmin via {URI}\n";
$lng['customer']['mysql_add']['infomail_body']['main'] = "Hello {CUST_NAME},\n\nyou have just added a new database. Here is the entered information:\n\nDatabasename: {DB_NAME}\nPassword: {DB_PASS}\nDescription: {DB_DESC}\nDB-Hostname: {DB_SRV}\n{PMA_URI}\nYours sincerely, the Froxlor-Team";
$lng['customer']['mysql_add']['infomail_body']['main'] = "Hello {CUST_NAME},\n\nyou have just added a new database. Here is the entered information:\n\nDatabasename: {DB_NAME}\nPassword: {DB_PASS}\nDescription: {DB_DESC}\nDB-Hostname: {DB_SRV}\nphpMyAdmin: {PMA_URI}\nYours sincerely, the Froxlor-Team";
$lng['error']['domains_cantdeletedomainwithapsinstances'] = 'You cannot delete a domain which is used by an installed APS package. You have to uninstall it first.';
$lng['serversettings']['awstats_path'] = 'Path to AWStats \'awstats_buildstaticpages.pl\'';
$lng['serversettings']['awstats_conf'] = 'AWStats configuration path';
@@ -1473,5 +1472,19 @@ $lng['question']['remove_subbutmain_domains'] = 'Also remove domains which are a
$lng['domains']['issubof'] = 'This domain is a subdomain of another domain';
$lng['domains']['issubofinfo'] = 'You have to set this to the correct domain if you want to add a subdomain as full-domain (e.g. you want to add "www.domain.tld", you have to select "domain.tld" here)';
$lng['domains']['nosubtomaindomain'] = 'No subdomain of a full domain';
$lng['admin']['templates']['new_database_by_customer'] = 'Customer-notification when a database has been created';
$lng['admin']['templates']['new_ftpaccount_by_customer'] = 'Customer-notification when a ftp-user has been created';
$lng['admin']['templates']['newdatabase'] = 'Notification-mails for new databases';
$lng['admin']['templates']['newftpuser'] = 'Notification-mails for new ftp-user';
$lng['admin']['templates']['CUST_NAME'] = 'Customer name';
$lng['admin']['templates']['DB_NAME'] = 'Database name';
$lng['admin']['templates']['DB_PASS'] = 'Database password';
$lng['admin']['templates']['DB_DESC'] = 'Database description';
$lng['admin']['templates']['DB_SRV'] = 'Database server';
$lng['admin']['templates']['PMA_URI'] = 'URL to phpMyAdmin (if given)';
$lng['admin']['notgiven'] = '[not given]';
$lng['admin']['templates']['USR_NAME'] = 'FTP username';
$lng['admin']['templates']['USR_PASS'] = 'FTP password';
$lng['admin']['templates']['USR_PATH'] = 'FTP homedir (relative to customer-docroot)';
?>

17
lng/german.lng.php
View File

@@ -1334,8 +1334,7 @@ $lng['ftp']['account_edit'] = 'FTP Konto bearbeiten';
$lng['ftp']['editpassdescription'] = 'Neues Passwort setzen oder leer f&uuml;r keine &Auml;nderung.';
$lng['customer']['sendinfomail'] = 'Daten per E-Mail an mich senden';
$lng['customer']['mysql_add']['infomail_subject'] = '[Froxlor] Neue Datenbank erstellt';
$lng['customer']['mysql_add']['infomail_body']['pma'] = "\nDie Datenbank kann mit phpMyAdmin via {URI} verwaltet werden.\n";
$lng['customer']['mysql_add']['infomail_body']['main'] = "Hallo {CUST_NAME},\n\ndu hast gerade eine neue Datenbank angelegt. Hier die angegebenen Informationen:\n\nDatenbankname: {DB_NAME}\nPasswort: {DB_PASS}\nBeschreibung: {DB_DESC}\nDatenbank-Server: {DB_SRV}\n{PMA_URI}\nVielen Dank, das Froxlor-Team";
$lng['customer']['mysql_add']['infomail_body']['main'] = "Hallo {CUST_NAME},\n\ndu hast gerade eine neue Datenbank angelegt. Hier die angegebenen Informationen:\n\nDatenbankname: {DB_NAME}\nPasswort: {DB_PASS}\nBeschreibung: {DB_DESC}\nDatenbank-Server: {DB_SRV}\nphpMyAdmin: {PMA_URI}\nVielen Dank, das Froxlor-Team";
$lng['error']['domains_cantdeletedomainwithapsinstances'] = 'Sie k&ouml;nnen keine Domain l&ouml;schen, die noch von APS Paketen verwendet wird. L&ouml;schen Sie zuerst alle installierten APS Pakete dieser Domain.';
$lng['serversettings']['awstats_path'] = 'Pfad zu AWStats \'awstats_buildstaticpages.pl\'';
$lng['serversettings']['awstats_conf'] = 'AWStats Konfigurations-Pfad';
@@ -1456,5 +1455,19 @@ $lng['question']['remove_subbutmain_domains'] = 'Auch Domains entfernen, welche
$lng['domains']['issubof'] = 'Diese Domain ist eine Subdomain von der Domain';
$lng['domains']['issubofinfo'] = 'Diese Einstellung muss gesetzt werden, wenn Sie eine Subdomain einer Hauptdomain als Hauptdomain anlegen (z.B. soll "www.domain.tld" hinzugef&uuml;gt werden, somit muss hier "domain.tld" ausgew&auml;hlt werden)';
$lng['domains']['nosubtomaindomain'] = 'Keine Subdomain einer Hauptdomain';
$lng['admin']['templates']['new_database_by_customer'] = 'Kunden-Benachrichtigungs nach Erstellung einer neuen Datenbank';
$lng['admin']['templates']['new_ftpaccount_by_customer'] = 'Kunden-Benachrichtigung nach Erstellung eines neuen FTP-Benutzers';
$lng['admin']['templates']['newdatabase'] = 'Benachrichtigungs-Mails f&uuml;r neue Datenbank';
$lng['admin']['templates']['newftpuser'] = 'Benachrichtigungs-Mails f&uuml;r neuen FTP-Benutzer';
$lng['admin']['templates']['CUST_NAME'] = 'Kundenname';
$lng['admin']['templates']['DB_NAME'] = 'Datenbankname';
$lng['admin']['templates']['DB_PASS'] = 'Datenbankpasswort';
$lng['admin']['templates']['DB_DESC'] = 'Datenbankbeschreibung';
$lng['admin']['templates']['DB_SRV'] = 'Datenbankserver';
$lng['admin']['templates']['PMA_URI'] = 'URL zu phpMyAdmin (wenn angegeben)';
$lng['admin']['notgiven'] = '[nicht angegeben]';
$lng['admin']['templates']['USR_NAME'] = 'FTP Benutzername';
$lng['admin']['templates']['USR_PASS'] = 'FTP Passwort';
$lng['admin']['templates']['USR_PATH'] = 'FTP Heimatverzeichnis (relativ zum Kunden-Heimatverzeichnis)';
?>

70
templates/admin/templates/templates_add_2.tpl
View File

@@ -60,18 +60,18 @@ $header
<td class="field_name">{$lng['admin']['templates']['EMAIL']}</td>
</tr>
<if $settings['panel']['sendalternativemail'] == 1>
<tr>
<td class="field_display_border_left" colspan="2"><b>{$lng['admin']['templates']['pop_success_alternative']}</b></td>
</tr>
<tr>
<td class="field_name_border_left"><i>{EMAIL}</i>:</td>
<td class="field_name">{$lng['admin']['templates']['EMAIL']}</td>
</tr>
<tr>
<td class="field_name_border_left"><i>{PASSWORD}</i>:</td>
<td class="field_name">{$lng['admin']['templates']['EMAIL_PASSWORD']}</td>
</tr>
</if>
<tr>
<td class="field_display_border_left" colspan="2"><b>{$lng['admin']['templates']['pop_success_alternative']}</b></td>
</tr>
<tr>
<td class="field_name_border_left"><i>{EMAIL}</i>:</td>
<td class="field_name">{$lng['admin']['templates']['EMAIL']}</td>
</tr>
<tr>
<td class="field_name_border_left"><i>{PASSWORD}</i>:</td>
<td class="field_name">{$lng['admin']['templates']['EMAIL_PASSWORD']}</td>
</tr>
</if>
<tr>
<td class="field_display_border_left" colspan="2"><b>{$lng['admin']['templates']['trafficninetypercent']}</b></td>
</tr>
@@ -98,6 +98,52 @@ $header
<td class="field_name_border_left"><i>{NAME}</i>:</td>
<td class="field_name">{$lng['admin']['templates']['NAME']}</td>
</tr>
<tr>
<td class="field_display_border_left" colspan="2"><b>{$lng['admin']['templates']['newdatabase']}</b></td>
</tr>
<tr>
<td class="field_name_border_left"><i>{CUST_NAME}</i>:</td>
<td class="field_name">{$lng['admin']['templates']['CUST_NAME']}</td>
</tr>
<tr>
<td class="field_name_border_left"><i>{DB_NAME}</i>:</td>
<td class="field_name">{$lng['admin']['templates']['DB_NAME']}</td>
</tr>
<tr>
<td class="field_name_border_left"><i>{DB_PASS}</i>:</td>
<td class="field_name">{$lng['admin']['templates']['DB_PASS']}</td>
</tr>
<tr>
<td class="field_name_border_left"><i>{DB_DESC}</i>:</td>
<td class="field_name">{$lng['admin']['templates']['DB_DESC']}</td>
</tr>
<tr>
<td class="field_name_border_left"><i>{DB_SRV}</i>:</td>
<td class="field_name">{$lng['admin']['templates']['DB_SRV']}</td>
</tr>
<tr>
<td class="field_name_border_left"><i>{PMA_URI}</i>:</td>
<td class="field_name">{$lng['admin']['templates']['PMA_URI']}</td>
</tr>
<tr>
<td class="field_display_border_left" colspan="2"><b>{$lng['admin']['templates']['newftpuser']}</b></td>
</tr>
<tr>
<td class="field_name_border_left"><i>{CUST_NAME}</i>:</td>
<td class="field_name">{$lng['admin']['templates']['CUST_NAME']}</td>
</tr>
<tr>
<td class="field_name_border_left"><i>{USR_NAME}</i>:</td>
<td class="field_name">{$lng['admin']['templates']['USR_NAME']}</td>
</tr>
<tr>
<td class="field_name_border_left"><i>{USR_PASS}</i>:</td>
<td class="field_name">{$lng['admin']['templates']['USR_PASS']}</td>
</tr>
<tr>
<td class="field_name_border_left"><i>{USR_PATH}</i>:</td>
<td class="field_name">{$lng['admin']['templates']['USR_PATH']}</td>
</tr>
</table>
</form>
<br />

70
templates/admin/templates/templates_edit.tpl
View File

@@ -62,18 +62,18 @@ $header
<td class="field_name">{$lng['admin']['templates']['EMAIL']}</td>
</tr>
<if $settings['panel']['sendalternativemail'] == 1>
<tr>
<td class="field_display_border_left" colspan="2"><b>{$lng['admin']['templates']['pop_success_alternative']}</b></td>
</tr>
<tr>
<td class="field_name_border_left"><i>{EMAIL}</i>:</td>
<td class="field_name">{$lng['admin']['templates']['EMAIL']}</td>
</tr>
<tr>
<td class="field_name_border_left"><i>{PASSWORD}</i>:</td>
<td class="field_name">{$lng['admin']['templates']['EMAIL_PASSWORD']}</td>
</tr>
</if>
<tr>
<td class="field_display_border_left" colspan="2"><b>{$lng['admin']['templates']['pop_success_alternative']}</b></td>
</tr>
<tr>
<td class="field_name_border_left"><i>{EMAIL}</i>:</td>
<td class="field_name">{$lng['admin']['templates']['EMAIL']}</td>
</tr>
<tr>
<td class="field_name_border_left"><i>{PASSWORD}</i>:</td>
<td class="field_name">{$lng['admin']['templates']['EMAIL_PASSWORD']}</td>
</tr>
</if>
<tr>
<td class="field_display_border_left" colspan="2"><b>{$lng['admin']['templates']['trafficninetypercent']}</b></td>
</tr>
@@ -100,6 +100,52 @@ $header
<td class="field_name_border_left"><i>{NAME}</i>:</td>
<td class="field_name">{$lng['admin']['templates']['NAME']}</td>
</tr>
<tr>
<td class="field_display_border_left" colspan="2"><b>{$lng['admin']['templates']['newdatabase']}</b></td>
</tr>
<tr>
<td class="field_name_border_left"><i>{CUST_NAME}</i>:</td>
<td class="field_name">{$lng['admin']['templates']['CUST_NAME']}</td>
</tr>
<tr>
<td class="field_name_border_left"><i>{DB_NAME}</i>:</td>
<td class="field_name">{$lng['admin']['templates']['DB_NAME']}</td>
</tr>
<tr>
<td class="field_name_border_left"><i>{DB_PASS}</i>:</td>
<td class="field_name">{$lng['admin']['templates']['DB_PASS']}</td>
</tr>
<tr>
<td class="field_name_border_left"><i>{DB_DESC}</i>:</td>
<td class="field_name">{$lng['admin']['templates']['DB_DESC']}</td>
</tr>
<tr>
<td class="field_name_border_left"><i>{DB_SRV}</i>:</td>
<td class="field_name">{$lng['admin']['templates']['DB_SRV']}</td>
</tr>
<tr>
<td class="field_name_border_left"><i>{PMA_URI}</i>:</td>
<td class="field_name">{$lng['admin']['templates']['PMA_URI']}</td>
</tr>
<tr>
<td class="field_display_border_left" colspan="2"><b>{$lng['admin']['templates']['newftpuser']}</b></td>
</tr>
<tr>
<td class="field_name_border_left"><i>{CUST_NAME}</i>:</td>
<td class="field_name">{$lng['admin']['templates']['CUST_NAME']}</td>
</tr>
<tr>
<td class="field_name_border_left"><i>{USR_NAME}</i>:</td>
<td class="field_name">{$lng['admin']['templates']['USR_NAME']}</td>
</tr>
<tr>
<td class="field_name_border_left"><i>{USR_PASS}</i>:</td>
<td class="field_name">{$lng['admin']['templates']['USR_PASS']}</td>
</tr>
<tr>
<td class="field_name_border_left"><i>{USR_PATH}</i>:</td>
<td class="field_name">{$lng['admin']['templates']['USR_PATH']}</td>
</tr>
</table>
</form>
<br />