Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Zvonimir
ISPConfig 3
Commits
868e7aff
Commit
868e7aff
authored
Nov 04, 2011
by
latham
Browse files
email autoresponder patches. Now with subject line and language file updates
parent
687eb2f8
Changes
4
Hide whitespace changes
Inline
Side-by-side
interface/web/mail/form/mail_user.tform.php
View file @
868e7aff
...
...
@@ -196,7 +196,7 @@ $form["tabs"]['mailuser'] = array (
'value'
=>
array
(
1
=>
'y'
,
0
=>
'n'
)
),
##################################
# END
E
Datatable fields
# END Datatable fields
##################################
)
);
...
...
@@ -209,6 +209,14 @@ $form["tabs"]['autoresponder'] = array (
##################################
# Begin Datatable fields
##################################
'autoresponder_subject'
=>
array
(
'datatype'
=>
'VARCHAR'
,
'formtype'
=>
'TEXT'
,
'default'
=>
'Out of office reply'
,
'value'
=>
''
,
'width'
=>
'30'
,
'maxlength'
=>
'255'
),
'autoresponder_text'
=>
array
(
'datatype'
=>
'TEXT'
,
'formtype'
=>
'TEXTAREA'
,
...
...
@@ -242,7 +250,7 @@ $form["tabs"]['autoresponder'] = array (
),
),
##################################
# END
E
Datatable fields
# END Datatable fields
##################################
)
);
...
...
@@ -262,7 +270,7 @@ $form["tabs"]['filter_records'] = array (
'value'
=>
array
(
0
=>
'n'
,
1
=>
'y'
)
),
##################################
# END
E
Datatable fields
# END Datatable fields
##################################
),
'plugins'
=>
array
(
...
...
@@ -296,7 +304,7 @@ $form["tabs"]['mailfilter'] = array (
'rows'
=>
'15'
),
##################################
# END
E
Datatable fields
# END Datatable fields
##################################
)
);
...
...
interface/web/mail/lib/lang/en_mail_user.lng
View file @
868e7aff
...
...
@@ -6,6 +6,8 @@ $wb["password_strength_txt"] = 'Password strength';
$wb
[
"active_txt"
]
=
'Active'
;
$wb
[
"email_error_isemail"
]
=
'Email address is invalid.'
;
$wb
[
"email_error_unique"
]
=
'Duplicate Email address.'
;
$wb
[
"autoresponder_subject_txt"
]
=
'Email Subject'
;
$wb
[
"autoresponder_subject"
]
=
'Out of office reply'
;
$wb
[
"autoresponder_text_txt"
]
=
'Text'
;
$wb
[
"autoresponder_txt"
]
=
'Active'
;
$wb
[
"autoresponder_start_date_txt"
]
=
'Start on'
;
...
...
interface/web/mail/lib/lang/es_mail_user.lng
View file @
868e7aff
...
...
@@ -6,7 +6,9 @@ $wb['password_strength_txt'] = 'Fortaleza de la contraseña';
$wb
[
'active_txt'
]
=
'Activar'
;
$wb
[
'email_error_isemail'
]
=
'La dirección de correo no es válida.'
;
$wb
[
'email_error_unique'
]
=
'Dirección de correo duplicada.'
;
$wb
[
'autoresponder_subject_txt'
]
=
'Asunto'
;
$wb
[
'autoresponder_text_txt'
]
=
'Texto'
;
$wb
[
'autoresponder_subject'
]
=
'Fuera de la Oficina'
;
$wb
[
'autoresponder_txt'
]
=
'Autorespondedor'
;
$wb
[
'no_domain_perm'
]
=
'No tiene permiso para administrar este dominio.'
;
$wb
[
'error_no_pwd'
]
=
'La contraseña está vacía.'
;
...
...
interface/web/mail/templates/mail_user_autoresponder_edit.htm
View file @
868e7aff
...
...
@@ -2,36 +2,41 @@
<p><tmpl_var
name=
"list_desc_txt"
></p>
<div
class=
"panel panel_mail_user"
>
<div
class=
"pnl_formsarea"
>
<fieldset
class=
"inlineLabels"
>
<div
class=
"ctrlHolder"
>
<label
for=
"autoresponder_text"
>
{tmpl_var name='autoresponder_text_txt'}
</label>
<textarea
name=
"autoresponder_text"
id=
"autoresponder_text"
rows=
'15'
cols=
'30'
>
{tmpl_var name='autoresponder_text'}
</textarea>
</div>
<div
class=
"ctrlHolder"
>
<p
class=
"label"
>
{tmpl_var name='autoresponder_txt'}
</p>
<div
class=
"multiField"
>
<div
class=
"ctrlHolder"
style=
"margin-bottom: 5px;"
>
<label
for=
"autoresponder"
><input
type=
"checkbox"
value=
"y"
id=
"autoresponder"
name=
"autoresponder"
onclick=
"AR_ResetDates();"
{
tmpl_var
name=
'ar_active'
}
/>
{tmpl_var name='autoresponder_active'}
</label><br
/>
</div>
<p
style=
"margin-bottom: 3px;"
>
<label
for=
"autoresponder_start_date[day]"
style=
"width: 55px;"
>
{tmpl_var name='autoresponder_start_date_txt'}
</label>
{tmpl_var name='autoresponder_start_date'}
<a
href=
"javascript:AR_SetNow();"
>
{tmpl_var name='now_txt'}
</a></p>
<label
for=
"password"
style=
"width: 55px;"
>
{tmpl_var name='autoresponder_end_date_txt'}
</label>
{tmpl_var name='autoresponder_end_date'}
</div>
</div>
</fieldset>
<input
type=
"hidden"
name=
"id"
value=
"{tmpl_var name='id'}"
>
<div
class=
"buttonHolder buttons"
>
<button
class=
"positive iconstxt icoPositive"
type=
"button"
value=
"{tmpl_var name='btn_save_txt'}"
onClick=
"submitForm('pageForm','mail/mail_user_edit.php');"
><span>
{tmpl_var name='btn_save_txt'}
</span></button>
<button
class=
"negative iconstxt icoNegative"
type=
"button"
value=
"{tmpl_var name='btn_cancel_txt'}"
onClick=
"loadContent('mail/mail_user_list.php');"
><span>
{tmpl_var name='btn_cancel_txt'}
</span></button>
</div>
</div>
<div
class=
"pnl_formsarea"
>
<fieldset
class=
"inlineLabels"
>
<div
class=
"ctrlHolder"
>
<label
for=
"autoresponder_subject"
>
{tmpl_var name='autoresponder_subject_txt'}
</label>
<input
type=
"text"
name=
"autoresponder_subject"
id=
"autoresponder_subject"
maxlength=
'250'
value=
"{tmpl_var name='autoresponder_subject'}"
/>
</div>
<div
class=
"ctrlHolder"
>
<label
for=
"autoresponder_text"
>
{tmpl_var name='autoresponder_text_txt'}
</label>
<textarea
name=
"autoresponder_text"
id=
"autoresponder_text"
rows=
'15'
cols=
'30'
>
{tmpl_var name='autoresponder_text'}
</textarea>
</div>
<div
class=
"ctrlHolder"
>
<label
for=
"autoresponder"
>
{tmpl_var name='autoresponder_active'}
</label>
<input
type=
"checkbox"
value=
"y"
id=
"autoresponder"
name=
"autoresponder"
onclick=
"AR_ResetDates();"
{
tmpl_var
name=
'ar_active'
}
/>
</div>
<div
class=
"ctrlHolder"
>
<label
for=
"autoresponder_start_date"
>
{tmpl_var name='autoresponder_start_date_txt'}
</label>
{tmpl_var name='autoresponder_start_date'}
<a
href=
"javascript:AR_SetNow();"
>
{tmpl_var name='now_txt'}
</a>
</div>
<div
class=
"ctrlHolder"
>
<label
for=
"autoresponder_end_date"
>
{tmpl_var name='autoresponder_end_date_txt'}
</label>
{tmpl_var name='autoresponder_end_date'}
</div>
</fieldset>
<input
type=
"hidden"
name=
"id"
value=
"{tmpl_var name='id'}"
>
<div
class=
"buttonHolder buttons"
>
<button
class=
"positive iconstxt icoPositive"
type=
"button"
value=
"{tmpl_var name='btn_save_txt'}"
onClick=
"submitForm('pageForm','mail/mail_user_edit.php');"
>
<span>
{tmpl_var name='btn_save_txt'}
</span>
</button>
<button
class=
"negative iconstxt icoNegative"
type=
"button"
value=
"{tmpl_var name='btn_cancel_txt'}"
onClick=
"loadContent('mail/mail_user_list.php');"
>
<span>
{tmpl_var name='btn_cancel_txt'}
</span>
</button>
</div>
</div>
</div>
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment