Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
I
ISPConfig 3
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
488
Issues
488
List
Boards
Labels
Service Desk
Milestones
Merge Requests
25
Merge Requests
25
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ISPConfig
ISPConfig 3
Commits
fb42a376
Commit
fb42a376
authored
Dec 14, 2018
by
Marius Burkard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- patch for mail lib improvement from previous commits
parent
0316d01e
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
6 deletions
+6
-6
install/sql/incremental/upd_dev_collection.sql
install/sql/incremental/upd_dev_collection.sql
+1
-1
install/sql/ispconfig3.sql
install/sql/ispconfig3.sql
+1
-1
interface/lib/classes/ispcmail.inc.php
interface/lib/classes/ispcmail.inc.php
+2
-2
server/lib/classes/ispcmail.inc.php
server/lib/classes/ispcmail.inc.php
+2
-2
No files found.
install/sql/incremental/upd_dev_collection.sql
View file @
fb42a376
...
...
@@ -154,7 +154,7 @@ CREATE TABLE IF NOT EXISTS `addons` (
CREATE
TABLE
IF
NOT
EXISTS
`sys_mailqueue`
(
`id`
int
(
10
)
unsigned
NOT
NULL
AUTO_INCREMENT
,
`from`
varchar
(
255
)
NOT
NULL
DEFAULT
''
,
`from
_address
`
varchar
(
255
)
NOT
NULL
DEFAULT
''
,
`recipients`
text
NOT
NULL
,
`mail_content`
mediumblob
NOT
NULL
,
`created`
timestamp
NOT
NULL
DEFAULT
CURRENT_TIMESTAMP
,
...
...
install/sql/ispconfig3.sql
View file @
fb42a376
...
...
@@ -1591,7 +1591,7 @@ CREATE TABLE `sys_log` (
CREATE
TABLE
IF
NOT
EXISTS
`sys_mailqueue`
(
`id`
int
(
10
)
unsigned
NOT
NULL
AUTO_INCREMENT
,
`from`
varchar
(
255
)
NOT
NULL
DEFAULT
''
,
`from
_address
`
varchar
(
255
)
NOT
NULL
DEFAULT
''
,
`recipients`
text
NOT
NULL
,
`mail_content`
mediumblob
NOT
NULL
,
`created`
timestamp
NOT
NULL
DEFAULT
CURRENT_TIMESTAMP
,
...
...
interface/lib/classes/ispcmail.inc.php
View file @
fb42a376
...
...
@@ -866,7 +866,7 @@ class ispcmail {
// Send mail:
$id
=
$mail
[
'id'
];
$from
=
$mail
[
'from'
];
$from
=
$mail
[
'from
_address
'
];
$recipients
=
explode
(
"
\n
"
,
$mail
[
'recipients'
]);
$mail_content
=
$mail
[
'mail_content'
];
...
...
@@ -914,7 +914,7 @@ class ispcmail {
*/
private
function
add_to_queue
(
$from
,
$recipients
,
$mail_content
)
{
global
$app
;
$app
->
db
->
query
(
'INSERT INTO `sys_mailqueue` (`from`, `recipients`, `mail_content`) VALUES (?,?,?)'
,
$from
,
implode
(
"
\n
"
,
$recipients
),
$mail_content
);
$app
->
db
->
query
(
'INSERT INTO `sys_mailqueue` (`from
_address
`, `recipients`, `mail_content`) VALUES (?,?,?)'
,
$from
,
implode
(
"
\n
"
,
$recipients
),
$mail_content
);
}
/**
...
...
server/lib/classes/ispcmail.inc.php
View file @
fb42a376
...
...
@@ -862,7 +862,7 @@ class ispcmail {
// Send mail:
$id
=
$mail
[
'id'
];
$from
=
$mail
[
'from'
];
$from
=
$mail
[
'from
_address
'
];
$recipients
=
explode
(
"
\n
"
,
$mail
[
'recipients'
]);
$mail_content
=
$mail
[
'mail_content'
];
...
...
@@ -910,7 +910,7 @@ class ispcmail {
*/
private
function
add_to_queue
(
$from
,
$recipients
,
$mail_content
)
{
global
$app
;
$app
->
db
->
query
(
'INSERT INTO `sys_mailqueue` (`from`, `recipients`, `mail_content`) VALUES (?,?,?)'
,
$from
,
implode
(
"
\n
"
,
$recipients
),
$mail_content
);
$app
->
db
->
query
(
'INSERT INTO `sys_mailqueue` (`from
_address
`, `recipients`, `mail_content`) VALUES (?,?,?)'
,
$from
,
implode
(
"
\n
"
,
$recipients
),
$mail_content
);
}
/**
...
...
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