- remove unused replacer-variable in admin_customers.php

- add already-implemented replacers to the templates so users actually know they exist
This commit is contained in:
Michael Kaufmann (d00p)
2010-08-13 08:39:56 +00:00
parent ffe20960d5
commit 2a5494c85a
5 changed files with 20 additions and 1 deletions

View File

@@ -671,7 +671,6 @@ if($page == 'customers'
$replace_arr = array( $replace_arr = array(
'FIRSTNAME' => $firstname, 'FIRSTNAME' => $firstname,
'NAME' => $name, 'NAME' => $name,
'TITLE' => $title,
'COMPANY' => $company, 'COMPANY' => $company,
'SALUTATION' => getCorrectUserSalutation(array('firstname' => $firstname, 'name' => $name, 'company' => $company)), 'SALUTATION' => getCorrectUserSalutation(array('firstname' => $firstname, 'name' => $name, 'company' => $company)),
'USERNAME' => $loginname, 'USERNAME' => $loginname,

View File

@@ -320,8 +320,10 @@ $lng['admin']['templates']['mailbody'] = 'Mail body';
$lng['admin']['templates']['createcustomer'] = 'Welcome mail for new customers'; $lng['admin']['templates']['createcustomer'] = 'Welcome mail for new customers';
$lng['admin']['templates']['pop_success'] = 'Welcome mail for new email accounts'; $lng['admin']['templates']['pop_success'] = 'Welcome mail for new email accounts';
$lng['admin']['templates']['template_replace_vars'] = 'Variables to be replaced in the template:'; $lng['admin']['templates']['template_replace_vars'] = 'Variables to be replaced in the template:';
$lng['admin']['templates']['SALUTATION'] = 'Replaced with a correct salutation';
$lng['admin']['templates']['FIRSTNAME'] = 'Replaced with the customers firstname.'; $lng['admin']['templates']['FIRSTNAME'] = 'Replaced with the customers firstname.';
$lng['admin']['templates']['NAME'] = 'Replaced with the customers name.'; $lng['admin']['templates']['NAME'] = 'Replaced with the customers name.';
$lng['admin']['templates']['COMPANY'] = 'Replaces with the customers company name';
$lng['admin']['templates']['USERNAME'] = 'Replaced with the customers account username.'; $lng['admin']['templates']['USERNAME'] = 'Replaced with the customers account username.';
$lng['admin']['templates']['PASSWORD'] = 'Replaced with the customers account password.'; $lng['admin']['templates']['PASSWORD'] = 'Replaced with the customers account password.';
$lng['admin']['templates']['EMAIL'] = 'Replaced with the address of the POP3/IMAP account.'; $lng['admin']['templates']['EMAIL'] = 'Replaced with the address of the POP3/IMAP account.';

View File

@@ -321,8 +321,10 @@ $lng['admin']['templates']['createcustomer'] = 'Willkommensmail für neue Ku
$lng['admin']['templates']['pop_success'] = 'Willkommensmail für neue E-Mail Konten'; $lng['admin']['templates']['pop_success'] = 'Willkommensmail für neue E-Mail Konten';
$lng['admin']['wwwserveralias'] = 'www. ServerAlias hinzufügen'; $lng['admin']['wwwserveralias'] = 'www. ServerAlias hinzufügen';
$lng['admin']['templates']['template_replace_vars'] = 'Variablen, die in den Vorlagen ersetzt werden:'; $lng['admin']['templates']['template_replace_vars'] = 'Variablen, die in den Vorlagen ersetzt werden:';
$lng['admin']['templates']['SALUTATION'] = 'Wird mit einer korrekten Anrede des Kunden ersetzt';
$lng['admin']['templates']['FIRSTNAME'] = 'Wird mit dem Vornamen des Kunden ersetzt.'; $lng['admin']['templates']['FIRSTNAME'] = 'Wird mit dem Vornamen des Kunden ersetzt.';
$lng['admin']['templates']['NAME'] = 'Wird mit dem Namen des Kunden ersetzt.'; $lng['admin']['templates']['NAME'] = 'Wird mit dem Namen des Kunden ersetzt.';
$lng['admin']['templates']['COMPANY'] = 'Wird mit dem Firmennamen des Kunden ersetzt.';
$lng['admin']['templates']['USERNAME'] = 'Wird mit dem Benutzernamen des neuen Kundenkontos ersetzt.'; $lng['admin']['templates']['USERNAME'] = 'Wird mit dem Benutzernamen des neuen Kundenkontos ersetzt.';
$lng['admin']['templates']['PASSWORD'] = 'Wird mit dem Passwort des neuen Kundenkontos ersetzt.'; $lng['admin']['templates']['PASSWORD'] = 'Wird mit dem Passwort des neuen Kundenkontos ersetzt.';
$lng['admin']['templates']['EMAIL'] = 'Wird mit der Adresse des neuen POP3/IMAP Kontos ersetzt.'; $lng['admin']['templates']['EMAIL'] = 'Wird mit der Adresse des neuen POP3/IMAP Kontos ersetzt.';

View File

@@ -36,6 +36,10 @@ $header
<tr> <tr>
<td class="field_display_border_left" colspan="2"><b>{$lng['admin']['templates']['createcustomer']}</b></td> <td class="field_display_border_left" colspan="2"><b>{$lng['admin']['templates']['createcustomer']}</b></td>
</tr> </tr>
<tr>
<td class="field_name_border_left"><i>{SALUTATION}</i>:</td>
<td class="field_name">{$lng['admin']['templates']['SALUTATION']}</td>
</tr>
<tr> <tr>
<td class="field_name_border_left"><i>{FIRSTNAME}</i>:</td> <td class="field_name_border_left"><i>{FIRSTNAME}</i>:</td>
<td class="field_name">{$lng['admin']['templates']['FIRSTNAME']}</td> <td class="field_name">{$lng['admin']['templates']['FIRSTNAME']}</td>
@@ -44,6 +48,10 @@ $header
<td class="field_name_border_left"><i>{NAME}</i>:</td> <td class="field_name_border_left"><i>{NAME}</i>:</td>
<td class="field_name">{$lng['admin']['templates']['NAME']}</td> <td class="field_name">{$lng['admin']['templates']['NAME']}</td>
</tr> </tr>
<tr>
<td class="field_name_border_left"><i>{COMPANY}</i>:</td>
<td class="field_name">{$lng['admin']['templates']['COMPANY']}</td>
</tr>
<tr> <tr>
<td class="field_name_border_left"><i>{USERNAME}</i>:</td> <td class="field_name_border_left"><i>{USERNAME}</i>:</td>
<td class="field_name">{$lng['admin']['templates']['USERNAME']}</td> <td class="field_name">{$lng['admin']['templates']['USERNAME']}</td>

View File

@@ -38,6 +38,10 @@ $header
<tr> <tr>
<td class="field_display_border_left" colspan="2"><b>{$lng['admin']['templates']['createcustomer']}</b></td> <td class="field_display_border_left" colspan="2"><b>{$lng['admin']['templates']['createcustomer']}</b></td>
</tr> </tr>
<tr>
<td class="field_name_border_left"><i>{SALUTATION}</i>:</td>
<td class="field_name">{$lng['admin']['templates']['SALUTATION']}</td>
</tr>
<tr> <tr>
<td class="field_name_border_left"><i>{FIRSTNAME}</i>:</td> <td class="field_name_border_left"><i>{FIRSTNAME}</i>:</td>
<td class="field_name">{$lng['admin']['templates']['FIRSTNAME']}</td> <td class="field_name">{$lng['admin']['templates']['FIRSTNAME']}</td>
@@ -46,6 +50,10 @@ $header
<td class="field_name_border_left"><i>{NAME}</i>:</td> <td class="field_name_border_left"><i>{NAME}</i>:</td>
<td class="field_name">{$lng['admin']['templates']['NAME']}</td> <td class="field_name">{$lng['admin']['templates']['NAME']}</td>
</tr> </tr>
<tr>
<td class="field_name_border_left"><i>{COMPANY}</i>:</td>
<td class="field_name">{$lng['admin']['templates']['COMPANY']}</td>
</tr>
<tr> <tr>
<td class="field_name_border_left"><i>{USERNAME}</i>:</td> <td class="field_name_border_left"><i>{USERNAME}</i>:</td>
<td class="field_name">{$lng['admin']['templates']['USERNAME']}</td> <td class="field_name">{$lng['admin']['templates']['USERNAME']}</td>