diff --git a/admin_templates.php b/admin_templates.php index e8e4e318..2f49433d 100644 --- a/admin_templates.php +++ b/admin_templates.php @@ -214,24 +214,23 @@ if ($action == '') { && $_POST['prepare'] == 'prepare' ) { //email templates - $language = validate($_POST['language'], 'language'); - $templates = array(); - $result_stmt = Database::prepare(" - SELECT `varname` FROM `" . TABLE_PANEL_TEMPLATES . "` - WHERE `adminid`= :adminid AND `language`= :lang - AND `templategroup` = 'mails' AND `varname` LIKE '%_subject'" - ); - Database::pexecute($result_stmt, array('adminid' => $userinfo['adminid'], 'lang' => $language)); + $language = validate($_POST['language'], 'language', '/^[^\r\n\0"\']+$/', 'nolanguageselect'); + $template = validate($_POST['template'], 'template'); - while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) { - $templates[] = str_replace('_subject', '', $row['varname']); + $lng_bak = $lng; + foreach ($langs['English'] as $key => $value) { + include_once makeSecurePath($value['file']); + } + if ($language != 'English') { + foreach ($langs[$language] as $key => $value) { + include makeSecurePath($value['file']); + } } - $templates = array_diff($available_templates, $templates); - $template_options = ''; - foreach ($templates as $template) { - $template_options.= makeoption($lng['admin']['templates'][$template], $template, NULL, true); - } + $subject = $lng['mails'][$template]['subject']; + $body = str_replace('\n', "\n", $lng['mails'][$template]['mailbody']); + + $lng = $lng_bak; $template_add_data = include_once dirname(__FILE__).'/lib/formfields/admin/templates/formfield.template_add.php'; $template_add_form = htmlform::genHTMLForm($template_add_data); @@ -328,6 +327,7 @@ if ($action == '') { //email templates $add = false; $language_options = ''; + $template_options = ''; while (list($language_file, $language_name) = each($languages)) { $templates = array(); @@ -344,7 +344,13 @@ if ($action == '') { if (count(array_diff($available_templates, $templates)) > 0) { $add = true; - $language_options.= makeoption($language_name, $language_file, $userinfo['language'], true); + $language_options.= makeoption($language_name, $language_file, $userinfo['language'], true, true); + + $templates = array_diff($available_templates, $templates); + + foreach ($templates as $template) { + $template_options.= makeoption($lng['admin']['templates'][$template], $template, NULL, true, true, $language_file) . "\n"; + } } } diff --git a/customer_ftp.php b/customer_ftp.php index f2886b44..0a86b43d 100644 --- a/customer_ftp.php +++ b/customer_ftp.php @@ -266,7 +266,7 @@ if ($page == 'overview') { ); Database::pexecute($result_stmt, array("adminid" => $userinfo['adminid'], "lang" => $def_language)); $result = $result_stmt->fetch(PDO::FETCH_ASSOC); - $mail_subject = html_entity_decode(replace_variables((($result['value'] != '') ? $result['value'] : $lng['customer']['ftp_add']['infomail_subject']), $replace_arr)); + $mail_subject = html_entity_decode(replace_variables((($result['value'] != '') ? $result['value'] : $lng['mails']['new_ftpaccount_by_customer']['subject']), $replace_arr)); $def_language = $userinfo['def_language']; $result_stmt = Database::prepare("SELECT `value` FROM `" . TABLE_PANEL_TEMPLATES . "` @@ -277,7 +277,7 @@ if ($page == 'overview') { ); Database::pexecute($result_stmt, array("adminid" => $userinfo['adminid'], "lang" => $def_language)); $result = $result_stmt->fetch(PDO::FETCH_ASSOC); - $mail_body = html_entity_decode(replace_variables((($result['value'] != '') ? $result['value'] : $lng['customer']['ftp_add']['infomail_body']['main']), $replace_arr)); + $mail_body = html_entity_decode(replace_variables((($result['value'] != '') ? $result['value'] : $lng['mails']['new_ftpaccount_by_customer']['mailbody']), $replace_arr)); $_mailerror = false; try { diff --git a/customer_mysql.php b/customer_mysql.php index 5c8a0315..4c0743ea 100644 --- a/customer_mysql.php +++ b/customer_mysql.php @@ -232,7 +232,7 @@ if ($page == 'overview') { ); Database::pexecute($result_stmt, array("adminid" => $userinfo['adminid'], "lang" => $def_language)); $result = $result_stmt->fetch(PDO::FETCH_ASSOC); - $mail_subject = html_entity_decode(replace_variables((($result['value'] != '') ? $result['value'] : $lng['customer']['mysql_add']['infomail_subject']), $replace_arr)); + $mail_subject = html_entity_decode(replace_variables((($result['value'] != '') ? $result['value'] : $lng['mails']['new_database_by_customer']['subject']), $replace_arr)); $result_stmt = Database::prepare("SELECT `value` FROM `" . TABLE_PANEL_TEMPLATES . "` WHERE `adminid`= :adminid @@ -242,7 +242,7 @@ if ($page == 'overview') { ); Database::pexecute($result_stmt, array("adminid" => $userinfo['adminid'], "lang" => $def_language)); $result = $result_stmt->fetch(PDO::FETCH_ASSOC); - $mail_body = html_entity_decode(replace_variables((($result['value'] != '') ? $result['value'] : $lng['customer']['mysql_add']['infomail_body']['main']), $replace_arr)); + $mail_body = html_entity_decode(replace_variables((($result['value'] != '') ? $result['value'] : $lng['mails']['new_database_by_customer']['mailbody']), $replace_arr)); $_mailerror = false; try { diff --git a/index.php b/index.php index 29b8686b..0ecc4727 100644 --- a/index.php +++ b/index.php @@ -383,8 +383,6 @@ if ($action == 'forgotpwd') { 'LINK' => $activationlink ); - $body = strtr($lng['pwdreminder']['body'], array('%s' => $user['firstname'] . ' ' . $user['name'], '%a' => $activationlink)); - $def_language = ($user['def_language'] != '') ? $user['def_language'] : Settings::Get('panel.standardlanguage'); $result_stmt = Database::prepare('SELECT `value` FROM `' . TABLE_PANEL_TEMPLATES . '` WHERE `adminid`= :adminid @@ -394,7 +392,7 @@ if ($action == 'forgotpwd') { ); Database::pexecute($result_stmt, array("adminid" => $user['adminid'], "lang" => $def_language)); $result = $result_stmt->fetch(PDO::FETCH_ASSOC); - $mail_subject = html_entity_decode(replace_variables((($result['value'] != '') ? $result['value'] : $lng['pwdreminder']['subject']), $replace_arr)); + $mail_subject = html_entity_decode(replace_variables((($result['value'] != '') ? $result['value'] : $lng['mails']['password_reset']['subject']), $replace_arr)); $result_stmt = Database::prepare('SELECT `value` FROM `' . TABLE_PANEL_TEMPLATES . '` WHERE `adminid`= :adminid @@ -404,7 +402,7 @@ if ($action == 'forgotpwd') { ); Database::pexecute($result_stmt, array("adminid" => $user['adminid'], "lang" => $def_language)); $result = $result_stmt->fetch(PDO::FETCH_ASSOC); - $mail_body = html_entity_decode(replace_variables((($result['value'] != '') ? $result['value'] : $body), $replace_arr)); + $mail_body = html_entity_decode(replace_variables((($result['value'] != '') ? $result['value'] : $lng['mails']['password_reset']['mailbody']), $replace_arr)); $_mailerror = false; try { diff --git a/lib/formfields/admin/templates/formfield.template_add.php b/lib/formfields/admin/templates/formfield.template_add.php index 0ecdd0be..48b9c22c 100644 --- a/lib/formfields/admin/templates/formfield.template_add.php +++ b/lib/formfields/admin/templates/formfield.template_add.php @@ -32,16 +32,19 @@ return array( ), 'template' => array( 'label' => $lng['admin']['templates']['action'], - 'type' => 'select', - 'select_var' => $template_options + 'type' => 'hidden', + 'value' => $template, + 'display' => $lng['admin']['templates'][$template] ), 'subject' => array( 'label' => $lng['admin']['templates']['subject'], - 'type' => 'text' + 'type' => 'text', + 'value' => $subject ), 'mailbody' => array( 'label' => $lng['admin']['templates']['mailbody'], 'type' => 'textarea', + 'value' => $body, 'cols' => 60, 'rows' => 12 ) diff --git a/lib/functions/output/function.makeoption.php b/lib/functions/output/function.makeoption.php index 6592bcb1..936610b4 100644 --- a/lib/functions/output/function.makeoption.php +++ b/lib/functions/output/function.makeoption.php @@ -29,7 +29,7 @@ * @author Florian Lippert */ -function makeoption($title, $value, $selvalue = NULL, $title_trusted = false, $value_trusted = false) +function makeoption($title, $value, $selvalue = NULL, $title_trusted = false, $value_trusted = false, $id = NULL) { if($selvalue !== NULL && ((is_array($selvalue) && in_array($value, $selvalue)) || $value == $selvalue)) @@ -51,6 +51,11 @@ function makeoption($title, $value, $selvalue = NULL, $title_trusted = false, $v $value = htmlspecialchars($value); } - $option = ''; + $id_str = ' '; + if($id !== NULL) { + $id_str = 'id="' . $id . '"'; + } + + $option = ''; return $option; } diff --git a/lng/dutch.lng.php b/lng/dutch.lng.php index 19f23c1d..e4a7197a 100644 --- a/lng/dutch.lng.php +++ b/lng/dutch.lng.php @@ -793,8 +793,8 @@ $lng['login']['presend'] = 'Wachtwoord opnieuw instellen'; $lng['login']['email'] = 'E-mailadres'; $lng['login']['remind'] = 'Mijn wachtwoord opnieuw instellen'; $lng['login']['usernotfound'] = 'Gebruiker niet gevonden!'; -$lng['pwdreminder']['subject'] = 'Froxlor - Wachtwoord opnieuw instellen'; -$lng['pwdreminder']['body'] = 'Hallo %s,\n\nuw wachtwoord voor Froxlor is opnieuw ingesteld!\nHet nieuwe wachtwoord is: %p\n\nMet vriendelijke groet,\nuw beheerder'; +$lng['mails']['password_reset']['subject'] = 'Wachtwoord opnieuw instellen'; +$lng['mails']['password_reset']['mailbody'] = 'Hallo {USERNAME},\n\nuw wachtwoord voor Froxlor is opnieuw ingesteld!\nHet nieuwe wachtwoord is: {LINK}\n\nMet vriendelijke groet,\nuw beheerder'; $lng['pwdreminder']['success'] = 'Wachtwoord opnieuw ingesteld.
U ontvangt spoedig een e-mail met uw nieuwe wachtwoord.'; // ADDED IN 1.2.19-svn18 @@ -1070,8 +1070,8 @@ $lng['serversettings']['stdsubdomainhost']['description'] = 'Welke hostnaam dien $lng['ftp']['account_edit'] = 'FTP account aanpassen'; $lng['ftp']['editpassdescription'] = 'Nieuw wachtwoord of leeg voor het oude wachtwoord.'; $lng['customer']['sendinfomail'] = 'Stuur gegevens naar mij via e-mail'; -$lng['customer']['mysql_add']['infomail_subject'] = '[Froxlor] Nieuwe database aangemaakt'; -$lng['customer']['mysql_add']['infomail_body']['main'] = "Geachte {CUST_NAME},\n\nu hebt zojuist een nieuwe database aangemaakt. Hier zijn nogmaals de ingevoerde gegevens:\n\nNaam database: {DB_NAME}\nWachtwoord: {DB_PASS}\nBeschrijving: {DB_DESC}\nHostnaam database: {DB_SRV}\nphpMyAdmin: {PMA_URI}\nMet vriendelijke groet, uw beheerder"; +$lng['mails']['new_database_by_customer']['subject'] = '[Froxlor] Nieuwe database aangemaakt'; +$lng['mails']['new_database_by_customer']['mailbody'] = "Geachte {CUST_NAME},\n\nu hebt zojuist een nieuwe database aangemaakt. Hier zijn nogmaals de ingevoerde gegevens:\n\nNaam database: {DB_NAME}\nWachtwoord: {DB_PASS}\nBeschrijving: {DB_DESC}\nHostnaam database: {DB_SRV}\nphpMyAdmin: {PMA_URI}\nMet vriendelijke groet, uw beheerder"; $lng['serversettings']['awstats_path'] = 'Pad naar \'awstats_buildstaticpages.pl\' van AWStats'; $lng['serversettings']['awstats_conf'] = 'AWStats configuratiepad'; $lng['error']['overviewsettingoptionisnotavalidfield'] = 'Woops, a field that should be displayed as an option in the settings-overview is not an excepted type. You can blame the developers for this. This should not happen!'; @@ -1109,8 +1109,8 @@ $lng['serversettings']['ftpserver']['desc'] = 'Indien PureFTPD geselecteerd is, $lng['serversettings']['ftpprefix']['description'] = 'Welk voorvoegsel dienen nieuwe FTP-accounts te krijgen?
Indien u dit wijzigt, dient ook de query voor Quota in het configuratiebestand van de FTP-server aan te passen! '; // ADDED IN FROXLOR 0.9.7-svn1 -$lng['customer']['ftp_add']['infomail_subject'] = '[Froxlor] Nieuwe FTP-gebruiker aangemaakt'; -$lng['customer']['ftp_add']['infomail_body']['main'] = "Geachte {CUST_NAME},\n\nu hebt zojuist een nieuwe FTP-gebruiker aangemaakt. Hier is de opgegeven informatie:\n\nGebruikersnaam: {USR_NAME}\nWachtwoord: {USR_PASS}\nPad: {USR_PATH}\n\nMet vriendelijke groet, uw beheerder"; +$lng['mails']['new_ftpaccount_by_customer']['subject'] = 'Nieuwe FTP-gebruiker aangemaakt'; +$lng['mails']['new_ftpaccount_by_customer']['mailbody'] = "Geachte {CUST_NAME},\n\nu hebt zojuist een nieuwe FTP-gebruiker aangemaakt. Hier is de opgegeven informatie:\n\nGebruikersnaam: {USR_NAME}\nWachtwoord: {USR_PASS}\nPad: {USR_PATH}\n\nMet vriendelijke groet, uw beheerder"; $lng['domains']['redirectifpathisurl'] = 'Doorverwijzingscode (standaard: leegt)'; $lng['domains']['redirectifpathisurlinfo'] = 'U dient deze alleen op te geven indien u een URL als pad hebt opgegeven'; $lng['serversettings']['customredirect_enabled']['title'] = 'Klanten toestaan doorverwijzingen te maken'; diff --git a/lng/english.lng.php b/lng/english.lng.php index 5477d122..99ded786 100644 --- a/lng/english.lng.php +++ b/lng/english.lng.php @@ -852,8 +852,8 @@ $lng['login']['presend'] = 'Reset password'; $lng['login']['email'] = 'E-mail address'; $lng['login']['remind'] = 'Reset my password'; $lng['login']['usernotfound'] = 'User not found!'; -$lng['pwdreminder']['subject'] = 'Froxlor - Password reset'; -$lng['pwdreminder']['body'] = 'Hello %s,\n\nhere is your link for setting a new password. This link is valid for the next 24 hours.\n\n%a\n\nThank you,\nyour administrator'; +$lng['mails']['password_reset']['subject'] = 'Password reset'; +$lng['mails']['password_reset']['mailbody'] = 'Hello {USERNAME},\n\nhere is your link for setting a new password. This link is valid for the next 24 hours.\n\n{LINK}\n\nThank you,\nyour administrator'; $lng['pwdreminder']['success'] = 'Password reset successfully requested. Please follow the instructions in the email you received.'; // ADDED IN 1.2.19-svn18 @@ -1140,8 +1140,8 @@ $lng['serversettings']['stdsubdomainhost']['description'] = 'What hostname shoul $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']['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, your administrator"; +$lng['mails']['new_database_by_customer']['subject'] = '[Froxlor] New database created'; +$lng['mails']['new_database_by_customer']['mailbody'] = "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, your administrator"; $lng['serversettings']['awstats_path'] = 'Path to AWStats \'awstats_buildstaticpages.pl\''; $lng['serversettings']['awstats_conf'] = 'AWStats configuration path'; $lng['error']['overviewsettingoptionisnotavalidfield'] = 'Woops, a field that should be displayed as an option in the settings-overview is not an excepted type. You can blame the developers for this. This should not happen!'; @@ -1179,8 +1179,8 @@ $lng['serversettings']['ftpserver']['desc'] = 'If pureftpd is selected the .ftpq $lng['serversettings']['ftpprefix']['description'] = 'Which prefix should ftp accounts have?
If you change this you also have to change the Quota SQL Query in your FTP Server config file in case you use it! '; // ADDED IN FROXLOR 0.9.7-svn1 -$lng['customer']['ftp_add']['infomail_subject'] = '[Froxlor] New ftp-user created'; -$lng['customer']['ftp_add']['infomail_body']['main'] = "Hello {CUST_NAME},\n\nyou have just added a new ftp-user. Here is the entered information:\n\nUsername: {USR_NAME}\nPassword: {USR_PASS}\nPath: {USR_PATH}\n\nYours sincerely, your administrator"; +$lng['mails']['new_ftpaccount_by_customer']['subject'] = 'New ftp-user created'; +$lng['mails']['new_ftpaccount_by_customer']['mailbody'] = "Hello {CUST_NAME},\n\nyou have just added a new ftp-user. Here is the entered information:\n\nUsername: {USR_NAME}\nPassword: {USR_PASS}\nPath: {USR_PATH}\n\nYours sincerely, your administrator"; $lng['domains']['redirectifpathisurl'] = 'Redirect code (default: empty)'; $lng['domains']['redirectifpathisurlinfo'] = 'You only need to select one of these if you entered an URL as path'; $lng['serversettings']['customredirect_enabled']['title'] = 'Allow customer redirects'; @@ -1336,8 +1336,8 @@ $lng['admin']['templates']['DISKAVAILABLE'] = 'Replaced with the diskusage in MB $lng['admin']['templates']['DISKUSED'] = 'Replaced with the diskusage in MB, which was exhausted by the customer.'; $lng['serversettings']['dropdown'] = 'Dropdown'; $lng['serversettings']['manual'] = 'Manual'; -$lng['mails']['webmaxpercent']['mailbody'] = 'Dear {NAME},\n\nyou used {DISKUSED} MB of your available {DISKAVAILABLE} MB of diskspace.\nThis is more than {MAX_PERCENT}%.\n\nYours sincerely, your administrator'; -$lng['mails']['webmaxpercent']['subject'] = 'Reaching your diskspace limit'; +$lng['mails']['diskmaxpercent']['mailbody'] = 'Dear {NAME},\n\nyou used {DISKUSED} MB of your available {DISKAVAILABLE} MB of diskspace.\nThis is more than {MAX_PERCENT}%.\n\nYours sincerely, your administrator'; +$lng['mails']['diskmaxpercent']['subject'] = 'Reaching your diskspace limit'; $lng['mysql']['database_edit'] = 'Edit database'; // ADDED IN FROXLOR 0.9.18 diff --git a/lng/french.lng.php b/lng/french.lng.php index 4b571387..a5090e1b 100644 --- a/lng/french.lng.php +++ b/lng/french.lng.php @@ -848,8 +848,8 @@ $lng['login']['presend'] = 'Réinitialiser le mot de passe'; $lng['login']['email'] = 'Adresse e-mail'; $lng['login']['remind'] = 'Réinitialiser mon mot de passe'; $lng['login']['usernotfound'] = 'Erreur : utilisateur inconnu !'; -$lng['pwdreminder']['subject'] = 'Froxlor - réinitialisation du mot de passe'; -$lng['pwdreminder']['body'] = 'Bonjour %s,\n\nVotre mot de passe pour Froxlor a été réinitialiser !\nLe nouveau mot de passe est : %p\n\nCordialement,\nL\'équipe Froxlor.'; +$lng['mails']['password_reset']['subject'] = 'réinitialisation du mot de passe'; +$lng['mails']['password_reset']['mailbody'] = 'Bonjour {USERNAME},\n\nVotre mot de passe pour Froxlor a été réinitialiser !\nLe nouveau mot de passe est : {LINK}\n\nCordialement,\nL\'équipe Froxlor.'; $lng['pwdreminder']['success'] = 'Mot de passe correctement réinitialiser.
Vous devriez recevoir un e-mail avec votre nouveau mot de passe d\'ici quelques minutes.'; // ADDED IN 1.2.19-svn18 diff --git a/lng/german.lng.php b/lng/german.lng.php index bc06d764..f3ba0deb 100644 --- a/lng/german.lng.php +++ b/lng/german.lng.php @@ -850,8 +850,8 @@ $lng['login']['presend'] = 'Passwort zurücksetzen'; $lng['login']['email'] = 'E-Mail-Adresse'; $lng['login']['remind'] = 'Passwort zurücksetzen'; $lng['login']['usernotfound'] = 'Fehler: Unbekannter Benutzer!'; -$lng['pwdreminder']['subject'] = 'Froxlor - Passwort zurückgesetzt'; -$lng['pwdreminder']['body'] = 'Hallo "%s",\n\nHiermit erhalten Sie den Link um ein neues Passwort zu setzen. Dieser Link ist für die nächsten 24 Stunden gültig.\n\n%a\n\nVielen Dank,\nIhr Administrator'; +$lng['mails']['password_reset']['subject'] = 'Passwort zurückgesetzt'; +$lng['mails']['password_reset']['mailbody'] = 'Hallo {USERNAME},\n\nHiermit erhalten Sie den Link um ein neues Passwort zu setzen. Dieser Link ist für die nächsten 24 Stunden gültig.\n\n{LINK}\n\nVielen Dank,\nIhr Administrator'; $lng['pwdreminder']['success'] = 'Das Zurücksetzen des Passworts wurde erfolgreich angefordert. Sie sollten nun eine E-Mail mit weiteren Anweisungen erhalten.'; // ADDED IN 1.2.19-svn18 @@ -1113,8 +1113,8 @@ $lng['serversettings']['stdsubdomainhost']['description'] = 'Welcher Hostname so $lng['ftp']['account_edit'] = 'FTP-Konto bearbeiten'; $lng['ftp']['editpassdescription'] = 'Neues Passwort setzen oder leer für keine Ä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']['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, Ihr Administrator"; +$lng['mails']['new_database_by_customer']['subject'] = '[Froxlor] Neue Datenbank erstellt'; +$lng['mails']['new_database_by_customer']['mailbody'] = "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, Ihr Administrator"; $lng['serversettings']['awstats_path'] = 'Pfad zu AWStats \'awstats_buildstaticpages.pl\''; $lng['serversettings']['awstats_conf'] = 'AWStats Konfigurations-Pfad'; $lng['error']['overviewsettingoptionisnotavalidfield'] = 'Hoppla, ein Feld, dass als Option in der Konfigurationsübersicht angezeigt werden soll, hat nicht den erwarteten Wert. Sie können den Entwicklern die Schuld geben. Dies sollte nicht passieren!'; @@ -1170,8 +1170,8 @@ $lng['serversettings']['ftpserver']['desc'] = 'Wenn pureftpd ausgewählt ist, we $lng['serversettings']['ftpprefix']['description'] = 'Welchen Präfix sollen die FTP-Benutzerkonten haben?
Wenn du das änderst, musst du auch das Quota-SQL-Query in der FTP-Server-Config ändern, solltest du FTP-Quotas benutzen!'; // ADDED IN FROXLOR 0.9.7-svn1 -$lng['customer']['ftp_add']['infomail_subject'] = '[Froxlor] Neuer FTP-Benutzer erstellt'; -$lng['customer']['ftp_add']['infomail_body']['main'] = "Hallo {CUST_NAME},\n\ndu hast gerade einen neuen FTP-Benutzer angelegt. Hier die angegebenen Informationen:\n\nBenutzername: {USR_NAME}\nPasswort: {USR_PASS}\nPfad: {USR_PATH}\n\nVielen Dank, Ihr Administrator"; +$lng['mails']['new_ftpaccount_by_customer']['subject'] = 'Neuer FTP-Benutzer erstellt'; +$lng['mails']['new_ftpaccount_by_customer']['mailbody'] = "Hallo {CUST_NAME},\n\ndu hast gerade einen neuen FTP-Benutzer angelegt. Hier die angegebenen Informationen:\n\nBenutzername: {USR_NAME}\nPasswort: {USR_PASS}\nPfad: {USR_PATH}\n\nVielen Dank, Ihr Administrator"; $lng['domains']['redirectifpathisurl'] = 'Redirect-Code (Standard: leer)'; $lng['domains']['redirectifpathisurlinfo'] = 'Der Redirect-Code kann gewählt werden, wenn der eingegebene Pfad eine URL ist'; $lng['serversettings']['customredirect_enabled']['title'] = 'Erlaube Kunden-Redirect'; @@ -1314,8 +1314,8 @@ $lng['admin']['templates']['DISKAVAILABLE'] = 'Wird mit dem Webspace, der dem Ku $lng['admin']['templates']['DISKUSED'] = 'Wird mit dem Webspace, welcher vom Kunden bereits verbraucht wurde, ersetzt (in MB).'; $lng['serversettings']['dropdown'] = 'Auswahlliste'; $lng['serversettings']['manual'] = 'Manuelle Eingabe'; -$lng['mails']['webmaxpercent']['mailbody'] = 'Sehr geehrte(r) {NAME},\n\nSie haben bereits {DISKUSED} MB von Ihren insgesamt {DISKAVAILABLE} MB Speicherplatz verbraucht.\nDies sind mehr als {MAX_PERCENT}%.\n\nVielen Dank,\nIhr Administrator'; -$lng['mails']['webmaxpercent']['subject'] = 'Sie erreichen bald Ihr Speicherplatz-Limit'; +$lng['mails']['diskmaxpercent']['mailbody'] = 'Sehr geehrte(r) {NAME},\n\nSie haben bereits {DISKUSED} MB von Ihren insgesamt {DISKAVAILABLE} MB Speicherplatz verbraucht.\nDies sind mehr als {MAX_PERCENT}%.\n\nVielen Dank,\nIhr Administrator'; +$lng['mails']['diskmaxpercent']['subject'] = 'Sie erreichen bald Ihr Speicherplatz-Limit'; $lng['mysql']['database_edit'] = 'Datenbank bearbeiten'; // ADDED IN FROXLOR 0.9.18 diff --git a/lng/italian.lng.php b/lng/italian.lng.php index cd20bf6a..6f9e641d 100644 --- a/lng/italian.lng.php +++ b/lng/italian.lng.php @@ -820,8 +820,8 @@ $lng['login']['presend'] = 'Reimposta la password'; $lng['login']['email'] = 'Indirizzo E-mail'; $lng['login']['remind'] = 'Reimposta la mia password'; $lng['login']['usernotfound'] = 'Utente non trovata!'; -$lng['pwdreminder']['subject'] = 'Froxlor - Reimposta password'; -$lng['pwdreminder']['body'] = 'Salve %s,\n\nla tua password froxlor è stata reimpostata!\nLa nuova password è: %p\n\nGrazie,\n Team Froxlor'; +$lng['mails']['password_reset']['subject'] = 'Reimposta password'; +$lng['mails']['password_reset']['mailbody'] = 'Salve {USERNAME},\n\nla tua password froxlor è stata reimpostata!\nLa nuova password è: {LINK}\n\nGrazie,\n Team Froxlor'; $lng['pwdreminder']['success'] = 'La password è stata reimpostata con successo.
A questo punto riceverai una email con la nuova password.'; // ADDED IN 1.2.19-svn18 @@ -1102,8 +1102,8 @@ $lng['serversettings']['stdsubdomainhost']['description'] = 'Quale hostname dovr $lng['ftp']['account_edit'] = 'Modifica acocunt FTP'; $lng['ftp']['editpassdescription'] = 'Imposta una nuova password o lascia vuoto per non cambiarla.'; $lng['customer']['sendinfomail'] = 'Inviami i dati via email'; -$lng['customer']['mysql_add']['infomail_subject'] = '[Froxlor] Nuovo database creato'; -$lng['customer']['mysql_add']['infomail_body']['main'] = "Hello {CUST_NAME},\n\nhai appena aggiunto un nuovo database. Ecco le informazioni inserite:\n\nNome database: {DB_NAME}\nPassword: {DB_PASS}\nDescrizione: {DB_DESC}\nDB-Hostname: {DB_SRV}\n{PMA_URI}\nCordiali Saluti, Team Froxlor"; +$lng['mails']['new_database_by_customer']['subject'] = '[Froxlor] Nuovo database creato'; +$lng['mails']['new_database_by_customer']['mailbody'] = "Hello {CUST_NAME},\n\nhai appena aggiunto un nuovo database. Ecco le informazioni inserite:\n\nNome database: {DB_NAME}\nPassword: {DB_PASS}\nDescrizione: {DB_DESC}\nDB-Hostname: {DB_SRV}\n{PMA_URI}\nCordiali Saluti, Team Froxlor"; $lng['serversettings']['awstats_path'] = 'Percorso a AWStats \'awstats_buildstaticpages.pl\''; $lng['serversettings']['awstats_conf'] = 'Cartella della configurazione di AWStats'; $lng['error']['overviewsettingoptionisnotavalidfield'] = 'Woops, un campo che dovrebbe essere mostrato come opzione in Impostazioni-Principale non è un tipo esclusivo. Si possono rimproverare gli sviluppatori per questo. Questo non deve accadere!'; @@ -1141,8 +1141,8 @@ $lng['serversettings']['ftpserver']['desc'] = 'Se pureftpd è selezionato i file $lng['serversettings']['ftpprefix']['description'] = 'Che prefisso vuoi che per gli account ftp?
Se si modifica questo devi anche modificare il limite (Quota) della query SQL nel file di configurazione del server FTP nel caso in cui venga usata! '; // ADDED IN FROXLOR 0.9.7-svn1 -$lng['customer']['ftp_add']['infomail_subject'] = '[Froxlor] Nuovo utente ftp creato'; -$lng['customer']['ftp_add']['infomail_body']['main'] = "Salve {CUST_NAME},\n\nhai appena aggiunto un nuovo utente ftp. Ecco le informazioni inserite:\n\nNome utente: {USR_NAME}\nPassword: {USR_PASS}\nPercorso: {USR_PATH}\n\nCordiali Saluti, Team Froxlor"; +$lng['mails']['new_ftpaccount_by_customer']['subject'] = 'Nuovo utente ftp creato'; +$lng['mails']['new_ftpaccount_by_customer']['mailbody'] = "Salve {CUST_NAME},\n\nhai appena aggiunto un nuovo utente ftp. Ecco le informazioni inserite:\n\nNome utente: {USR_NAME}\nPassword: {USR_PASS}\nPercorso: {USR_PATH}\n\nCordiali Saluti, Team Froxlor"; $lng['domains']['redirectifpathisurl'] = 'Codice di redirezione (Predefinito: vuoto)'; $lng['domains']['redirectifpathisurlinfo'] = 'È necessario selezionare uno di questi se hai inserito un URL come percorso'; $lng['serversettings']['customredirect_enabled']['title'] = 'Permetti ai clienti le redirezioni'; @@ -1301,8 +1301,8 @@ $lng['admin']['templates']['DISKAVAILABLE'] = 'Sostituito con il spazio utilizza $lng['admin']['templates']['DISKUSED'] = 'Sostituito con il spazio utilizzato in MB, che è stato esaurito da parte del cliente.'; $lng['serversettings']['dropdown'] = 'Dropdown'; $lng['serversettings']['manual'] = 'Manuale'; -$lng['mails']['webmaxpercent']['mailbody'] = 'Salve {NAME},\n\nhai utilizzato {DISKUSED} MB di {DISKAVAILABLE} MB di spazio disponibile.\nQuesto è più del {MAX_PERCENT}%.\n\nCordiali Saluti, il Team Froxlor'; -$lng['mails']['webmaxpercent']['subject'] = 'Raggiungere il limite di spazio su disco'; +$lng['mails']['diskmaxpercent']['mailbody'] = 'Salve {NAME},\n\nhai utilizzato {DISKUSED} MB di {DISKAVAILABLE} MB di spazio disponibile.\nQuesto è più del {MAX_PERCENT}%.\n\nCordiali Saluti, il Team Froxlor'; +$lng['mails']['diskmaxpercent']['subject'] = 'Raggiungere il limite di spazio su disco'; $lng['mysql']['database_edit'] = 'Modifica database'; // ADDED IN FROXLOR 0.9.18 diff --git a/lng/portugues.lng.php b/lng/portugues.lng.php index 1d8c743c..c3c46cd1 100644 --- a/lng/portugues.lng.php +++ b/lng/portugues.lng.php @@ -746,8 +746,8 @@ $lng['login']['presend'] = 'Resetar senha'; $lng['login']['email'] = 'Endereço de E-mail'; $lng['login']['remind'] = 'Resetar minha senha'; $lng['login']['usernotfound'] = 'Úsuario não encontrado'; -$lng['pwdreminder']['subject'] = 'Froxlor - Reset de Senha'; -$lng['pwdreminder']['body'] = 'Oi %s,\n\nsua senha do Froxlor foi resetada!\nA nova senha é: %p\n\nObrigado,\nequipe Froxlor'; +$lng['mails']['password_reset']['subject'] = 'Reset de Senha'; +$lng['mails']['password_reset']['mailbody'] = 'Oi {USERNAME},\n\nsua senha do Froxlor foi resetada!\nA nova senha é: {LINK}\n\nObrigado,\nequipe Froxlor'; $lng['pwdreminder']['success'] = 'Redefinição de senha com sucesso.
Você agora deve receber um e-mail com sua nova senha.'; $lng['serversettings']['allow_password_reset']['title'] = 'Aceita reset de senha por clientes'; $lng['pwdreminder']['notallowed'] = 'Reset de senhas está desativado'; diff --git a/scripts/jobs/cron_usage.inc.diskspace.php b/scripts/jobs/cron_usage.inc.diskspace.php index 53ba8f2d..2c74ef64 100644 --- a/scripts/jobs/cron_usage.inc.diskspace.php +++ b/scripts/jobs/cron_usage.inc.diskspace.php @@ -81,11 +81,11 @@ while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) { 'varname' => 'diskmaxpercent_subject' ); $result2 = Database::pexecute_first($result2_stmt, $result2_data); - $mail_subject = html_entity_decode(replace_variables((($result2['value'] != '') ? $result2['value'] : $lng['mails']['webmaxpercent']['subject']), $replace_arr)); + $mail_subject = html_entity_decode(replace_variables((($result2['value'] != '') ? $result2['value'] : $lng['mails']['diskmaxpercent']['subject']), $replace_arr)); $result2_data['varname'] = 'diskmaxpercent_mailbody'; $result2 = Database::pexecute_first($result2_stmt, $result2_data); - $mail_body = html_entity_decode(replace_variables((($result2['value'] != '') ? $result2['value'] : $lng['mails']['webmaxpercent']['mailbody']), $replace_arr)); + $mail_body = html_entity_decode(replace_variables((($result2['value'] != '') ? $result2['value'] : $lng['mails']['diskmaxpercent']['mailbody']), $replace_arr)); $_mailerror = false; try { @@ -171,11 +171,11 @@ while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) { 'varname' => 'diskmaxpercent_subject' ); $result2 = Database::pexecute_first($result2_stmt, $result2_data); - $mail_subject = html_entity_decode(replace_variables((($result2['value'] != '') ? $result2['value'] : $lng['mails']['webmaxpercent']['subject']), $replace_arr)); + $mail_subject = html_entity_decode(replace_variables((($result2['value'] != '') ? $result2['value'] : $lng['mails']['diskmaxpercent']['subject']), $replace_arr)); $result2_data['varname'] = 'diskmaxpercent_mailbody'; $result2 = Database::pexecute_first($result2_stmt, $result2_data); - $mail_body = html_entity_decode(replace_variables((($result2['value'] != '') ? $result2['value'] : $lng['mails']['webmaxpercent']['mailbody']), $replace_arr)); + $mail_body = html_entity_decode(replace_variables((($result2['value'] != '') ? $result2['value'] : $lng['mails']['diskmaxpercent']['mailbody']), $replace_arr)); $_mailerror = false; try { diff --git a/templates/Sparkle/admin/templates/templates_add_1.tpl b/templates/Sparkle/admin/templates/templates_add_1.tpl index 9c11f3ef..b65cd35d 100644 --- a/templates/Sparkle/admin/templates/templates_add_1.tpl +++ b/templates/Sparkle/admin/templates/templates_add_1.tpl @@ -17,8 +17,12 @@ $header - - + + + + + + @@ -30,4 +34,5 @@ $header + $footer diff --git a/templates/Sparkle/admin/templates/templates_add_2.tpl b/templates/Sparkle/admin/templates/templates_add_2.tpl index a6df4668..e00dab52 100644 --- a/templates/Sparkle/admin/templates/templates_add_2.tpl +++ b/templates/Sparkle/admin/templates/templates_add_2.tpl @@ -40,193 +40,170 @@ $header - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- {$lng['admin']['templates']['createcustomer']} -
{SALUTATION}{$lng['admin']['templates']['SALUTATION']}
{FIRSTNAME}{$lng['admin']['templates']['FIRSTNAME']}
{NAME}{$lng['admin']['templates']['NAME']}
{COMPANY}{$lng['admin']['templates']['COMPANY']}
{USERNAME}{$lng['admin']['templates']['USERNAME']}
{PASSWORD}{$lng['admin']['templates']['PASSWORD']}
- {$lng['admin']['templates']['pop_success']} -
{EMAIL}{$lng['admin']['templates']['EMAIL']}
- {$lng['admin']['templates']['pop_success_alternative']} -
{EMAIL}{$lng['admin']['templates']['EMAIL']}
{PASSWORD}{$lng['admin']['templates']['EMAIL_PASSWORD']}
{SALUTATION}{$lng['admin']['templates']['SALUTATION']}
{FIRSTNAME}{$lng['admin']['templates']['FIRSTNAME']}
{NAME}{$lng['admin']['templates']['NAME']}
{COMPANY}{$lng['admin']['templates']['COMPANY']}
{USERNAME}{$lng['admin']['templates']['USERNAME']}
{PASSWORD}{$lng['admin']['templates']['PASSWORD']}
{EMAIL}{$lng['admin']['templates']['EMAIL']}
+ {$lng['admin']['templates']['pop_success_alternative']} +
{EMAIL}{$lng['admin']['templates']['EMAIL']}
{PASSWORD}{$lng['admin']['templates']['EMAIL_PASSWORD']}
{SALUTATION}{$lng['admin']['templates']['SALUTATION']}
{USERNAME}{$lng['admin']['templates']['USERNAME']}
{LINK}{$lng['admin']['templates']['LINK']}
{TRAFFIC}{$lng['admin']['templates']['TRAFFIC']}
{TRAFFICUSED}{$lng['admin']['templates']['TRAFFICUSED']}
{MAX_PERCENT}{$lng['admin']['templates']['MAX_PERCENT']}
{USAGE_PERCENT}{$lng['admin']['templates']['USAGE_PERCENT']}
{DISKAVAILABLE}{$lng['admin']['templates']['DISKAVAILABLE']}
{DISKUSED}{$lng['admin']['templates']['DISKUSED']}
{MAX_PERCENT}{$lng['admin']['templates']['MAX_PERCENT']}
{USAGE_PERCENT}{$lng['admin']['templates']['USAGE_PERCENT']}
{SUBJECT}{$lng['admin']['templates']['SUBJECT']}
{SALUTATION}{$lng['admin']['templates']['SALUTATION']}
{FIRSTNAME}{$lng['admin']['templates']['FIRSTNAME']}
{NAME}{$lng['admin']['templates']['NAME']}
{COMPANY}{$lng['admin']['templates']['COMPANY']}
{SALUTATION}{$lng['admin']['templates']['SALUTATION']}
{DB_NAME}{$lng['admin']['templates']['DB_NAME']}
{DB_PASS}{$lng['admin']['templates']['DB_PASS']}
{DB_DESC}{$lng['admin']['templates']['DB_DESC']}
{DB_SRV}{$lng['admin']['templates']['DB_SRV']}
{PMA_URI}{$lng['admin']['templates']['PMA_URI']}
{SALUTATION}{$lng['admin']['templates']['SALUTATION']}
{USR_NAME}{$lng['admin']['templates']['USR_NAME']}
{USR_PASS}{$lng['admin']['templates']['USR_PASS']}
{USR_PATH}{$lng['admin']['templates']['USR_PATH']}
- {$lng['admin']['templates']['forgotpwd']} -
{SALUTATION}{$lng['admin']['templates']['SALUTATION']}
{USERNAME}{$lng['admin']['templates']['USERNAME']}
{LINK}{$lng['admin']['templates']['LINK']}
- {$lng['admin']['templates']['trafficmaxpercent']} -
{TRAFFIC}{$lng['admin']['templates']['TRAFFIC']}
{TRAFFICUSED}{$lng['admin']['templates']['TRAFFICUSED']}
{MAX_PERCENT}{$lng['admin']['templates']['MAX_PERCENT']}
{USAGE_PERCENT}{$lng['admin']['templates']['USAGE_PERCENT']}
- {$lng['admin']['templates']['diskmaxpercent']} -
{DISKAVAILABLE}{$lng['admin']['templates']['DISKAVAILABLE']}
{DISKUSED}{$lng['admin']['templates']['DISKUSED']}
{MAX_PERCENT}{$lng['admin']['templates']['MAX_PERCENT']}
{USAGE_PERCENT}{$lng['admin']['templates']['USAGE_PERCENT']}
- {$lng['admin']['templates']['ticket']} -
{SUBJECT}{$lng['admin']['templates']['SUBJECT']}
{SALUTATION}{$lng['admin']['templates']['SALUTATION']}
{FIRSTNAME}{$lng['admin']['templates']['FIRSTNAME']}
{NAME}{$lng['admin']['templates']['NAME']}
{COMPANY}{$lng['admin']['templates']['COMPANY']}
- {$lng['admin']['templates']['newdatabase']} -
{SALUTATION}{$lng['admin']['templates']['SALUTATION']}
{DB_NAME}{$lng['admin']['templates']['DB_NAME']}
{DB_PASS}{$lng['admin']['templates']['DB_PASS']}
{DB_DESC}{$lng['admin']['templates']['DB_DESC']}
{DB_SRV}{$lng['admin']['templates']['DB_SRV']}
{PMA_URI}{$lng['admin']['templates']['PMA_URI']}
- {$lng['admin']['templates']['newftpuser']} -
{SALUTATION}{$lng['admin']['templates']['SALUTATION']}
{USR_NAME}{$lng['admin']['templates']['USR_NAME']}
{USR_PASS}{$lng['admin']['templates']['USR_PASS']}
{USR_PATH}{$lng['admin']['templates']['USR_PATH']}
diff --git a/templates/Sparkle/admin/templates/templates_edit.tpl b/templates/Sparkle/admin/templates/templates_edit.tpl index 7a85e069..7a6fcb5c 100644 --- a/templates/Sparkle/admin/templates/templates_edit.tpl +++ b/templates/Sparkle/admin/templates/templates_edit.tpl @@ -42,193 +42,170 @@ $header - - - {$lng['admin']['templates']['createcustomer']} - - - - {SALUTATION} - {$lng['admin']['templates']['SALUTATION']} - - - {FIRSTNAME} - {$lng['admin']['templates']['FIRSTNAME']} - - - {NAME} - {$lng['admin']['templates']['NAME']} - - - {COMPANY} - {$lng['admin']['templates']['COMPANY']} - - - {USERNAME} - {$lng['admin']['templates']['USERNAME']} - - - {PASSWORD} - {$lng['admin']['templates']['PASSWORD']} - - - - {$lng['admin']['templates']['pop_success']} - - - - {EMAIL} - {$lng['admin']['templates']['EMAIL']} - - - - - {$lng['admin']['templates']['pop_success_alternative']} - - - - {EMAIL} - {$lng['admin']['templates']['EMAIL']} - - - {PASSWORD} - {$lng['admin']['templates']['EMAIL_PASSWORD']} - + + + {SALUTATION} + {$lng['admin']['templates']['SALUTATION']} + + + {FIRSTNAME} + {$lng['admin']['templates']['FIRSTNAME']} + + + {NAME} + {$lng['admin']['templates']['NAME']} + + + {COMPANY} + {$lng['admin']['templates']['COMPANY']} + + + {USERNAME} + {$lng['admin']['templates']['USERNAME']} + + + {PASSWORD} + {$lng['admin']['templates']['PASSWORD']} + + + + + {EMAIL} + {$lng['admin']['templates']['EMAIL']} + + + + + {$lng['admin']['templates']['pop_success_alternative']} + + + + {EMAIL} + {$lng['admin']['templates']['EMAIL']} + + + {PASSWORD} + {$lng['admin']['templates']['EMAIL_PASSWORD']} + + + + + + {SALUTATION} + {$lng['admin']['templates']['SALUTATION']} + + + {USERNAME} + {$lng['admin']['templates']['USERNAME']} + + + {LINK} + {$lng['admin']['templates']['LINK']} + + + + + {TRAFFIC} + {$lng['admin']['templates']['TRAFFIC']} + + + {TRAFFICUSED} + {$lng['admin']['templates']['TRAFFICUSED']} + + + {MAX_PERCENT} + {$lng['admin']['templates']['MAX_PERCENT']} + + + {USAGE_PERCENT} + {$lng['admin']['templates']['USAGE_PERCENT']} + + + + + {DISKAVAILABLE} + {$lng['admin']['templates']['DISKAVAILABLE']} + + + {DISKUSED} + {$lng['admin']['templates']['DISKUSED']} + + + {MAX_PERCENT} + {$lng['admin']['templates']['MAX_PERCENT']} + + + {USAGE_PERCENT} + {$lng['admin']['templates']['USAGE_PERCENT']} + + + + + {SUBJECT} + {$lng['admin']['templates']['SUBJECT']} + + + {SALUTATION} + {$lng['admin']['templates']['SALUTATION']} + + + {FIRSTNAME} + {$lng['admin']['templates']['FIRSTNAME']} + + + {NAME} + {$lng['admin']['templates']['NAME']} + + + {COMPANY} + {$lng['admin']['templates']['COMPANY']} + + + + + {SALUTATION} + {$lng['admin']['templates']['SALUTATION']} + + + {DB_NAME} + {$lng['admin']['templates']['DB_NAME']} + + + {DB_PASS} + {$lng['admin']['templates']['DB_PASS']} + + + {DB_DESC} + {$lng['admin']['templates']['DB_DESC']} + + + {DB_SRV} + {$lng['admin']['templates']['DB_SRV']} + + + {PMA_URI} + {$lng['admin']['templates']['PMA_URI']} + + + + + {SALUTATION} + {$lng['admin']['templates']['SALUTATION']} + + + {USR_NAME} + {$lng['admin']['templates']['USR_NAME']} + + + {USR_PASS} + {$lng['admin']['templates']['USR_PASS']} + + + {USR_PATH} + {$lng['admin']['templates']['USR_PATH']} + - - - {$lng['admin']['templates']['forgotpwd']} - - - - {SALUTATION} - {$lng['admin']['templates']['SALUTATION']} - - - {USERNAME} - {$lng['admin']['templates']['USERNAME']} - - - {LINK} - {$lng['admin']['templates']['LINK']} - - - - {$lng['admin']['templates']['trafficmaxpercent']} - - - - {TRAFFIC} - {$lng['admin']['templates']['TRAFFIC']} - - - {TRAFFICUSED} - {$lng['admin']['templates']['TRAFFICUSED']} - - - {MAX_PERCENT} - {$lng['admin']['templates']['MAX_PERCENT']} - - - {USAGE_PERCENT} - {$lng['admin']['templates']['USAGE_PERCENT']} - - - - {$lng['admin']['templates']['diskmaxpercent']} - - - - {DISKAVAILABLE} - {$lng['admin']['templates']['DISKAVAILABLE']} - - - {DISKUSED} - {$lng['admin']['templates']['DISKUSED']} - - - {MAX_PERCENT} - {$lng['admin']['templates']['MAX_PERCENT']} - - - {USAGE_PERCENT} - {$lng['admin']['templates']['USAGE_PERCENT']} - - - - {$lng['admin']['templates']['ticket']} - - - - {SUBJECT} - {$lng['admin']['templates']['SUBJECT']} - - - {SALUTATION} - {$lng['admin']['templates']['SALUTATION']} - - - {FIRSTNAME} - {$lng['admin']['templates']['FIRSTNAME']} - - - {NAME} - {$lng['admin']['templates']['NAME']} - - - {COMPANY} - {$lng['admin']['templates']['COMPANY']} - - - - {$lng['admin']['templates']['newdatabase']} - - - - {SALUTATION} - {$lng['admin']['templates']['SALUTATION']} - - - {DB_NAME} - {$lng['admin']['templates']['DB_NAME']} - - - {DB_PASS} - {$lng['admin']['templates']['DB_PASS']} - - - {DB_DESC} - {$lng['admin']['templates']['DB_DESC']} - - - {DB_SRV} - {$lng['admin']['templates']['DB_SRV']} - - - {PMA_URI} - {$lng['admin']['templates']['PMA_URI']} - - - - {$lng['admin']['templates']['newftpuser']} - - - - {SALUTATION} - {$lng['admin']['templates']['SALUTATION']} - - - {USR_NAME} - {$lng['admin']['templates']['USR_NAME']} - - - {USR_PASS} - {$lng['admin']['templates']['USR_PASS']} - - - {USR_PATH} - {$lng['admin']['templates']['USR_PATH']} - diff --git a/templates/Sparkle/assets/js/main.js b/templates/Sparkle/assets/js/main.js index 413ce725..e1116631 100644 --- a/templates/Sparkle/assets/js/main.js +++ b/templates/Sparkle/assets/js/main.js @@ -145,4 +145,12 @@ $(document).ready(function() { }); } }); + // Mail Templates + var mailTemplate = $("#mailTemplate").html(); + $("#mailLanguage").change(function() { + var mailLanguage = $(this).val(); + var mailOptions = $(mailTemplate).filter(function() { return !$(this).attr("id") || $(this).attr("id") == mailLanguage; }); + $("#mailTemplate").html(mailOptions); + }); + $("#mailLanguage").trigger("change"); }); \ No newline at end of file