From 62e68fcb8a6871689b13859fd589d5fb54b9ce2f Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Wed, 4 Sep 2019 21:23:01 +0200 Subject: [PATCH] fixed from field, added schema email_account --- saimod_mail.php | 3 ++- sql/DATA_SAIMOD_MAIL.php | 3 ++- sql/mysql/schema_email_account.sql | 13 +++++++++++++ 3 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 sql/mysql/schema_email_account.sql diff --git a/saimod_mail.php b/saimod_mail.php index 28ced9e..0a6acc0 100644 --- a/saimod_mail.php +++ b/saimod_mail.php @@ -80,7 +80,8 @@ class saimod_mail extends \SYSTEM\SAI\sai_module{ true); } $to = $email; - $from = \SYSTEM\PAGE\replace::replace($email_data['sender'],$replacements); + //$from = \SYSTEM\PAGE\replace::replace($email_data['sender'],$replacements); + $from = $email_data['account']; $subject = \SYSTEM\PAGE\replace::replace($email_data['subject'],$replacements); $text = \SYSTEM\PAGE\replace::replace($template_text['value'], $replacements); $html = \SYSTEM\PAGE\replace::replace($template_html['value'], $replacements); diff --git a/sql/DATA_SAIMOD_MAIL.php b/sql/DATA_SAIMOD_MAIL.php index 807dfc5..aaa6a9d 100644 --- a/sql/DATA_SAIMOD_MAIL.php +++ b/sql/DATA_SAIMOD_MAIL.php @@ -3,7 +3,8 @@ namespace SQL; class DATA_SAIMOD_MAIL extends \SYSTEM\DB\QI { public static function get_class(){return \get_class();} public static function files_mysql(){ - return array( (new \PSAI('/saimod_mail/sql/mysql/schema_contact.sql'))->SERVERPATH(), + return array( (new \PSAI('/saimod_mail/sql/mysql/schema_email_account.sql'))->SERVERPATH(), + (new \PSAI('/saimod_mail/sql/mysql/schema_contact.sql'))->SERVERPATH(), (new \PSAI('/saimod_mail/sql/mysql/schema_contact_email_list.sql'))->SERVERPATH(), (new \PSAI('/saimod_mail/sql/mysql/schema_email.sql'))->SERVERPATH(), (new \PSAI('/saimod_mail/sql/mysql/schema_email_image.sql'))->SERVERPATH(), diff --git a/sql/mysql/schema_email_account.sql b/sql/mysql/schema_email_account.sql new file mode 100644 index 0000000..a1265a3 --- /dev/null +++ b/sql/mysql/schema_email_account.sql @@ -0,0 +1,13 @@ +CREATE TABLE `email_account` ( + `email` VARCHAR(255) NOT NULL, + `imap` VARCHAR(255) NOT NULL, + `host` VARCHAR(255) NOT NULL, + `port` INT(10) UNSIGNED NOT NULL, + `auth` INT(10) UNSIGNED NOT NULL DEFAULT '1', + `username` VARCHAR(255) NOT NULL, + `password` VARCHAR(255) NOT NULL, + PRIMARY KEY (`email`) +) +COLLATE='utf8_general_ci' +ENGINE=InnoDB +; \ No newline at end of file