From fb42a376593a4ecb31039d3bcd5460e086976bf4 Mon Sep 17 00:00:00 2001 From: Marius Burkard Date: Fri, 14 Dec 2018 12:49:05 +0100 Subject: [PATCH] - patch for mail lib improvement from previous commits --- install/sql/incremental/upd_dev_collection.sql | 2 +- install/sql/ispconfig3.sql | 2 +- interface/lib/classes/ispcmail.inc.php | 4 ++-- server/lib/classes/ispcmail.inc.php | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/install/sql/incremental/upd_dev_collection.sql b/install/sql/incremental/upd_dev_collection.sql index bda812f68b..4fc891f8e8 100644 --- a/install/sql/incremental/upd_dev_collection.sql +++ b/install/sql/incremental/upd_dev_collection.sql @@ -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, diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql index cf0586b612..c3d17421d8 100644 --- a/install/sql/ispconfig3.sql +++ b/install/sql/ispconfig3.sql @@ -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, diff --git a/interface/lib/classes/ispcmail.inc.php b/interface/lib/classes/ispcmail.inc.php index a3256b5ff6..209cb5bd43 100644 --- a/interface/lib/classes/ispcmail.inc.php +++ b/interface/lib/classes/ispcmail.inc.php @@ -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); } /** diff --git a/server/lib/classes/ispcmail.inc.php b/server/lib/classes/ispcmail.inc.php index 93d7b6069c..3ffabe8c4f 100644 --- a/server/lib/classes/ispcmail.inc.php +++ b/server/lib/classes/ispcmail.inc.php @@ -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); } /** -- GitLab