diff --git a/common.php b/common.php
index 8684cc4b..229a8c08 100644
--- a/common.php
+++ b/common.php
@@ -108,6 +108,13 @@ const TFS_FIRST = TFS_02;
const TFS_LAST = TFS_03;
// other definitions
+const MAIL_MAIL = 0;
+const MAIL_SMTP = 1;
+
+const SMTP_SECURITY_NONE = 0;
+const SMTP_SECURITY_SSL = 1;
+const SMTP_SECURITY_TLS = 2;
+
const ACCOUNT_NUMBER_LENGTH = 8;
if (!IS_CLI) {
diff --git a/system/functions.php b/system/functions.php
index 217e1b82..a30c697b 100644
--- a/system/functions.php
+++ b/system/functions.php
@@ -856,9 +856,6 @@ function _mail($to, $subject, $body, $altBody = '', $add_html_tags = true)
else
$tmp_body = $body . '
' . $signature_html;
- define('MAIL_MAIL', 0);
- define('MAIL_SMTP', 1);
-
$mailOption = setting('core.mail_option');
if($mailOption == MAIL_SMTP)
{
@@ -869,10 +866,6 @@ function _mail($to, $subject, $body, $altBody = '', $add_html_tags = true)
$mailer->Username = setting('core.smtp_user');
$mailer->Password = setting('core.smtp_pass');
- define('SMTP_SECURITY_NONE', 0);
- define('SMTP_SECURITY_SSL', 1);
- define('SMTP_SECURITY_TLS', 2);
-
$security = setting('core.smtp_security');
$tmp = '';