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
Guilherme Filippo
ISPConfig 3
Commits
510f1d06
Commit
510f1d06
authored
Jan 29, 2009
by
Antennipasi
Browse files
replaced windows linebreaks with *nix ones.
parent
0d2db5a9
Changes
1
Hide whitespace changes
Inline
Side-by-side
interface/web/mail/mail_user_edit.php
View file @
510f1d06
...
...
@@ -207,15 +207,15 @@ class page_action extends tform_actions {
$iconvPreferences
=
array
(
"input-charset"
=>
$fromCharset
,
"output-charset"
=>
"ISO-8859-1"
,
"line-length"
=>
76
,
"line-break-chars"
=>
"
\
r\
n
"
,
"line-break-chars"
=>
"
\n
"
,
"scheme"
=>
"Q"
);
$welcomeFromName
=
$app
->
tform
->
wordbook
[
"welcome_mail_fromname_txt"
];
$welcomeFromEmail
=
$app
->
tform
->
wordbook
[
"welcome_mail_fromemail_txt"
];
$mailHeaders
=
"MIME-Version: 1.0"
.
"
\
r\
n
"
;
$mailHeaders
.
=
"Content-type: text/plain; charset=iso-8859-1"
.
"
\
r\
n
"
;
$mailHeaders
.
=
"From:
$welcomeFromName
<
$welcomeFromEmail
>"
.
"
\
r\
n
"
;
$mailHeaders
.
=
"Reply-To: <
$welcomeFromEmail
>"
.
"
\
r\
n
"
;
$mailHeaders
=
"MIME-Version: 1.0"
.
"
\n
"
;
$mailHeaders
.
=
"Content-type: text/plain; charset=iso-8859-1"
.
"
\n
"
;
$mailHeaders
.
=
"From:
$welcomeFromName
<
$welcomeFromEmail
>"
.
"
\n
"
;
$mailHeaders
.
=
"Reply-To: <
$welcomeFromEmail
>"
.
"
\n
"
;
$mailTarget
=
$this
->
dataRecord
[
"email"
];
$mailSubject
=
iconv_mime_encode
(
"trimoff"
,
$app
->
tform
->
wordbook
[
"welcome_mail_subject"
],
$iconvPreferences
);
$mailSubject
=
str_replace
(
"trimoff: "
,
""
,
$mailSubject
);
...
...
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