Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Register
Sign in
Toggle navigation
Menu
Open sidebar
Dirk Dankhoff
ISPConfig 3
Commits
f442da03
Commit
f442da03
authored
Nov 21, 2011
by
tbrehm
Browse files
- Readded sieve filter master file.
parent
ae6b86b0
Changes
3
Hide whitespace changes
Inline
Side-by-side
interface/lib/classes/functions.inc.php
View file @
f442da03
...
...
@@ -73,6 +73,8 @@ class functions {
mail
(
$to
,
$subject
,
""
,
$header
);
}
else
{
$header
=
"From:
$from
\n
Reply-To:
$from
\n
"
;
$header
.
=
"Content-Type: text/plain;
\n\t
charset=
\"
UTF-8
\"\n
"
;
$header
.
=
"Content-Transfer-Encoding: 8bit
\n\n
"
;
mail
(
$to
,
$subject
,
$text
,
$header
);
}
...
...
server/conf/sieve_filter.master
0 → 100644
View file @
f442da03
require ["fileinto", "regex", "vacation"];
<tmpl_if name="cc">
# Send a copy of email to
redirect "<tmpl_var name='cc'>";
keep;
</tmpl_if>
<tmpl_if name="move_junk" op="==" value="y">
# Move spam to spam folder
if header :contains "X-Spam-Flag" "YES" {
fileinto "Junk";
# Stop here so that we do not reply on spams
stop;
}
</tmpl_if>
<tmpl_var name='custom_mailfilter'>
<tmpl_if name="autoresponder" op="==" value="y">
#################################################################
# Autoreply
#################################################################
# Move spam to spam folder
if header :contains "X-Spam-Flag" "YES" {
fileinto "Junk";
# Stop here so that we do not reply on spams
stop;
}
vacation :days 1
:subject "Out of office reply"
# :addresses ["test@test.int", "till@test.int"]
"<tmpl_var name='autoresponder_text'>";
</tmpl_if>
server/plugins-available/apache2_plugin.inc.php
View file @
f442da03
...
...
@@ -167,7 +167,7 @@ class apache2_plugin {
$app
->
log
(
"Creating CA-signed SSL Cert for:
$domain
"
,
LOGLEVEL_DEBUG
);
if
(
filesize
(
$crt_file
)
==
0
||
!
file_exists
(
$crt_file
))
$app
->
log
(
"CA-Certificate signing failed. openssl ca -out
$crt_file
-config "
.
$web_config
[
'CA_path'
]
.
"/openssl.cnf -passin pass:"
.
$web_config
[
'CA_pass'
]
.
" -in
$csr_file
"
,
LOGLEVEL_ERROR
);
};
if
(
filesize
(
$crt_file
)
==
0
||
!
file_exists
(
$crt_file
)){
if
(
@
filesize
(
$crt_file
)
==
0
||
!
file_exists
(
$crt_file
)){
exec
(
"openssl req -x509 -passin pass:
$ssl_password
-passout pass:
$ssl_password
-key
$key_file
-in
$csr_file
-out
$crt_file
-days
$ssl_days
-config
$config_file
"
);
$app
->
log
(
"Creating self-signed SSL Cert for:
$domain
"
,
LOGLEVEL_DEBUG
);
};
...
...
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