Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* merge two mails subject as the subject.

Browse Source
This commit is contained in:
chenfeiCF
2016-12-28 14:49:42 +08:00
parent 830d409121
commit d77aae1feb
2 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/mail/lang/zh-cn.php
+1
View File
@@ -68,6 +68,7 @@ $lang->mail->secureList[''] = '不加密';
$lang->mail->secureList['ssl'] = 'ssl';
$lang->mail->secureList['tls'] = 'tls';
$lang->mail->more = '更多...';
$lang->mail->inputFromEmail = '请输入发信邮箱：';
$lang->mail->nextStep = '下一步';
$lang->mail->successSaved = '配置信息已经成功保存。';
module/mail/model.php
+18 -10
View File
@@ -568,10 +568,20 @@ class mailModel extends model
$firstMail = array_shift($mails);
$lastMail = array_pop($mails);
$mail->id = $firstMail->id;
$mail->toList = $firstMail->toList;
$mail->ccList = $firstMail->ccList;
$mail->subject = $firstMail->subject;
/* Set mail info.*/
$mail->id = $firstMail->id;
$mail->toList = $firstMail->toList;
$mail->ccList = $firstMail->ccList;
$mail->subject = $firstMail->subject;
if($mails)
{
$secondMail = reset($mails);
$mail->subject .= '|' . $secondMail->subject . '|' . $this->lang->mail->more;
}
else
{
$mail->subject .= '|' . $lastMail->subject;
}
/* Remove html tail for first mail. */
$endPos = strripos($firstMail->body, '</td>');
@@ -582,8 +592,7 @@ class mailModel extends model
{
foreach($mails as $middleMail)
{
$mail->id .= ',' . $middleMail->id;
$mail->subject .= '|' . $middleMail->subject;
$mail->id .= ',' . $middleMail->id;
/* Remove html head and tail for middle mails. */
$beginPos = strpos($middleMail->body, '</table>');
@@ -595,12 +604,11 @@ class mailModel extends model
}
}
$mail->id .= ',' . $lastMail->id;
$mail->subject .= '|' . $lastMail->subject;
$mail->id .= ',' . $lastMail->id;
/* Remove html head for last mail. */
$beginPos = strpos($lastMail->body, '</table>');
$mailBody = substr($lastMail->body, $beginPos);
$beginPos = strpos($lastMail->body, '</table>');
$mailBody = substr($lastMail->body, $beginPos);
$mail->body .= trim(ltrim($mailBody, '</table>'));
return $mail;