diff --git a/application/config/mail.php b/application/config/mail.php index 4f1baa85d..5faa4d493 100644 --- a/application/config/mail.php +++ b/application/config/mail.php @@ -47,3 +47,6 @@ $config['sancho_mail_header_img'] = defined('SANCHO_MAIL_HEADER_IMG') ? SANCHO_M // footer image for custom mails $config['sancho_mail_footer_img'] = defined('SANCHO_MAIL_FOOTER_IMG') ? SANCHO_MAIL_FOOTER_IMG : ''; + +// If true, Sancho mails will be sent +$config['sancho_mail_enabled'] = defined('SANCHO_MAIL_ENABLED') ? SANCHO_MAIL_ENABLED : true; diff --git a/application/helpers/hlp_sancho_helper.php b/application/helpers/hlp_sancho_helper.php index 9a32f5e1a..e706b0572 100644 --- a/application/helpers/hlp_sancho_helper.php +++ b/application/helpers/hlp_sancho_helper.php @@ -53,6 +53,8 @@ function sendSanchoMail( $sancho_mail_config = $ci->config->item('mail'); + if ($sancho_mail_config['sancho_mail_enabled'] === false) + return true; if ($from == '') { diff --git a/config/global.config-default.inc.php b/config/global.config-default.inc.php index 0d4158b48..916b38b81 100644 --- a/config/global.config-default.inc.php +++ b/config/global.config-default.inc.php @@ -353,4 +353,7 @@ define('SANCHO_MAIL_HEADER_IMG', 'sancho_header_DEFAULT.jpg'); // footer image for eigene Mails define('SANCHO_MAIL_FOOTER_IMG', 'sancho_footer_DEFAULT.jpg'); + +// Gibt an, ob Sancho Mails verschickt werden oder nicht +define('SANCHO_MAIL_ENABLED', true); ?> diff --git a/include/sancho.inc.php b/include/sancho.inc.php index 4da3768b5..34decb0ff 100644 --- a/include/sancho.inc.php +++ b/include/sancho.inc.php @@ -41,6 +41,9 @@ const FALLBACK_SENDER = 'noreply'; */ function sendSanchoMail($vorlage_kurzbz, $vorlage_data, $to, $subject, $headerImg = '', $footerImg = '', $replyTo = '', $cc = '') { + if (defined('SANCHO_MAIL_ENABLED') && (SANCHO_MAIL_ENABLED === false)) + return true; + $from = ((defined('SANCHO_MAIL_DEFAULT_SENDER') && SANCHO_MAIL_DEFAULT_SENDER != '') ? SANCHO_MAIL_DEFAULT_SENDER : FALLBACK_SENDER)