Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Guilherme Filippo
ISPConfig 3
Commits
5c658438
Commit
5c658438
authored
Apr 14, 2014
by
Marius Cramer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed: FS#3431 - Systemmails via google's SMTP not working
parent
7dc4388e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
interface/lib/classes/ispcmail.inc.php
interface/lib/classes/ispcmail.inc.php
+5
-5
No files found.
interface/lib/classes/ispcmail.inc.php
View file @
5c658438
...
...
@@ -593,6 +593,11 @@ class ispcmail {
$response
=
fgets
(
$this
->
_smtp_conn
,
515
);
if
(
empty
(
$this
->
_smtp_conn
))
return
false
;
//Say Hello to SMTP
if
(
$this
->
smtp_helo
==
''
)
$this
->
detectHelo
();
fputs
(
$this
->
_smtp_conn
,
'HELO '
.
$this
->
smtp_helo
.
$this
->
_crlf
);
$response
=
fgets
(
$this
->
_smtp_conn
,
515
);
// ENCRYPTED?
if
(
$this
->
smtp_crypt
==
'tls'
)
{
fputs
(
$this
->
_smtp_conn
,
'STARTTLS'
.
$this
->
_crlf
);
...
...
@@ -600,11 +605,6 @@ class ispcmail {
stream_socket_enable_crypto
(
$this
->
_smtp_conn
,
true
,
STREAM_CRYPTO_METHOD_TLS_CLIENT
);
}
//Say Hello to SMTP
if
(
$this
->
smtp_helo
==
''
)
$this
->
detectHelo
();
fputs
(
$this
->
_smtp_conn
,
'HELO '
.
$this
->
smtp_helo
.
$this
->
_crlf
);
$response
=
fgets
(
$this
->
_smtp_conn
,
515
);
//AUTH LOGIN
fputs
(
$this
->
_smtp_conn
,
'AUTH LOGIN'
.
$this
->
_crlf
);
$response
=
fgets
(
$this
->
_smtp_conn
,
515
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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