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

* code for task#1259.

Browse Source
This commit is contained in:
chencongzhi520@gmail.com
2013-05-05 00:22:53 +00:00
parent 6b78acb6ac
commit 52c2beecbe
3 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
module/mail/control.php
View File

@@ -68,6 +68,7 @@ class mail extends control
$mailConfig = $this->config->mail->smtp;
$mailConfig->fromAddress = $this->config->mail->fromAddress;
$mailConfig->fromName = $this->config->mail->fromName;
$mailConfig->charset = zget($mailConfig, 'charset', 'utf-8');
}
elseif($this->session->mailConfig)
{

1
module/mail/model.php
View File

@@ -53,6 +53,7 @@ class mailModel extends model
$config->fromName = 'zentao';
$config->password = '';
$config->debug = 1;
$config->charset = 'utf-8';
if(!isset($config->host)) $config->host = '';
if(!isset($config->auth)) $config->auth = 1;
if(!isset($config->port)) $config->port = '25';

2
module/mail/view/edit.html.php
View File

@@ -56,7 +56,7 @@ include '../../common/view/header.html.php';
</tr>
<tr>
<th class='rowhead'><?php echo $lang->mail->charset; ?></th>
<td><?php echo html::radio('charset', $config->charsets[$this->cookie->lang], zget($config->charsets[$this->cookie->lang], $mailConfig->charset, 'utf-8', $mailConfig->charset));?></td>
<td><?php echo html::radio('charset', $config->charsets[$this->cookie->lang], $mailConfig->charset);?></td>
</tr>
<tr>