From e1ceb050e19c7574bca146a8da7047ee4ff456b5 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sun, 10 Jul 2016 05:02:35 -0400
Subject: [PATCH] Merge branch 'stable-3.1'
---
server/plugins-available/mail_plugin.inc.php | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/server/plugins-available/mail_plugin.inc.php b/server/plugins-available/mail_plugin.inc.php
index d0bb377..8275696 100644
--- a/server/plugins-available/mail_plugin.inc.php
+++ b/server/plugins-available/mail_plugin.inc.php
@@ -206,7 +206,9 @@
}
//* Send the welcome email message
- $domain = explode('@', $data["new"]["email"])[1];
+ $tmp = explode('@', $data["new"]["email"]);
+ $domain = $tmp[1];
+ unset($tmp);
$html = false;
if(file_exists($conf['rootpath'].'/conf-custom/mail/welcome_email_'.$domain.'.html')) {
$lines = file($conf['rootpath'].'/conf-custom/mail/welcome_email_'.$domain.'.html');
@@ -247,7 +249,7 @@
$mailHeaders .= "Content-Type: text/html; charset=utf-8" . "\n";
$mailHeaders .= "Content-Transfer-Encoding: quoted-printable" . "\n";
} else {
- $mailHeaders .= "Content-type: text/plain; charset=utf-8" . "\n";
+ $mailHeaders .= "Content-Type: text/plain; charset=utf-8" . "\n";
$mailHeaders .= "Content-Transfer-Encoding: 8bit" . "\n";
}
$mailHeaders .= "From: $welcome_mail_from" . "\n";
@@ -466,7 +468,9 @@
if( $server_config['backup_dir_is_mount'] == 'y' && !$app->system->mount_backup_dir($backup_dir) ) $mount_backup = false;
if($mount_backup){
$sql = "SELECT * FROM mail_domain WHERE domain = ?";
- $domain_rec = $app->db->queryOneRecord($sql, explode("@",$data['old']['email'])[1]);
+ $tmp = explode("@",$data['old']['email']);
+ $domain_rec = $app->db->queryOneRecord($sql,$tmp[1]);
+ unset($tmp);
if (is_array($domain_rec)) {
$mail_backup_dir = $backup_dir.'/mail'.$domain_rec['domain_id'];
$mail_backup_files = 'mail'.$data['old']['mailuser_id'];
--
Gitblit v1.9.1