bob
/
westdc-zf1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove mail addHeader(reply-to) method, which is prohibited in latest version(1.10)

This commit is contained in:
wlx 2010-11-08 07:11:56 +00:00
parent bb08b8c32f
commit b5fec2f7ce
4 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/admin/controllers/DownController.php
View File

@ -49,7 +49,6 @@ class Admin_DownController extends Zend_Controller_Action
$mail->setBodyText($body); $mail->setBodyText($body);
$mail->addTo($row['email']); $mail->addTo($row['email']);
$mail->setSubject('西部数据中心已收到您的纸质离线申请'); $mail->setSubject('西部数据中心已收到您的纸质离线申请');
$mail->addHeader('Reply-To', $this->view->config->service->email);
$mail->setFrom($this->view->config->service->email,'西部数据中心服务组'); $mail->setFrom($this->view->config->service->email,'西部数据中心服务组');
$mail->send(); $mail->send();
@ -103,7 +102,6 @@ class Admin_DownController extends Zend_Controller_Action
$mail->setBodyText($body); $mail->setBodyText($body);
$mail->addTo($row['email']); $mail->addTo($row['email']);
$mail->setSubject('西部数据中心已开通了您的离线申请'); $mail->setSubject('西部数据中心已开通了您的离线申请');
$mail->addHeader('Reply-To', $this->view->config->service->email);
$mail->setFrom($this->view->config->service->email,'西部数据中心服务组'); $mail->setFrom($this->view->config->service->email,'西部数据中心服务组');
$mail->send(); $mail->send();
} //ftp1 deal } //ftp1 deal

3
application/default/controllers/AccountController.php
View File

@ -46,7 +46,6 @@ class AccountController extends Zend_Controller_Action
$body=file_get_contents($this->view->config->register->email->template); $body=file_get_contents($this->view->config->register->email->template);
$body=str_replace("[username]",$formData['username'],$body); $body=str_replace("[username]",$formData['username'],$body);
$mail->setBodyText($body); $mail->setBodyText($body);
$mail->addHeader('Reply-To', $this->view->config->service->email);
$mail->setFrom($this->view->config->service->email,'西部数据中心服务组'); $mail->setFrom($this->view->config->service->email,'西部数据中心服务组');
$mail->addTo($formData['email']); $mail->addTo($formData['email']);
//中文标题有乱码，在1.5版本中尚未解决 //中文标题有乱码，在1.5版本中尚未解决
@ -233,7 +232,6 @@ class AccountController extends Zend_Controller_Action
"; ";
$body.="http://westdc.westgis.ac.cn/account/fetchpwd/".$username."/".$uid; $body.="http://westdc.westgis.ac.cn/account/fetchpwd/".$username."/".$uid;
$mail->setBodyText($body); $mail->setBodyText($body);
$mail->addHeader('Reply-To', $this->view->config->service->email);
$mail->setFrom($this->view->config->service->email,'西部数据中心服务组'); $mail->setFrom($this->view->config->service->email,'西部数据中心服务组');
$mail->addTo($formData['email']); $mail->addTo($formData['email']);
$mail->setSubject('密码已重置'); $mail->setSubject('密码已重置');
@ -263,7 +261,6 @@ class AccountController extends Zend_Controller_Action
$body.=" $body.="
http://westdc.westgis.ac.cn/account/login"; http://westdc.westgis.ac.cn/account/login";
$mail->setBodyText($body); $mail->setBodyText($body);
$mail->addHeader('Reply-To', $this->view->config->service->email);
$mail->setFrom($this->view->config->service->email,'西部数据中心服务组'); $mail->setFrom($this->view->config->service->email,'西部数据中心服务组');
$mail->addTo($urow->email); $mail->addTo($urow->email);
$mail->setSubject('您的新密码'); $mail->setSubject('您的新密码');

7
application/default/controllers/DataController.php
View File

@ -932,16 +932,9 @@ class DataController extends Zend_Controller_Action
$mail->setBodyText($body); $mail->setBodyText($body);
$mail->addTo($formData['email']); $mail->addTo($formData['email']);
$mail->setSubject('您在西部数据中心进行的离线申请'); $mail->setSubject('您在西部数据中心进行的离线申请');
$mail->addHeader('Reply-To', $this->view->config->service->email);
$mail->setFrom($this->view->config->service->email,'西部数据中心服务组'); $mail->setFrom($this->view->config->service->email,'西部数据中心服务组');
$attach=$mail->createAttachment($pdf->Output('applicant','S')); $attach=$mail->createAttachment($pdf->Output('applicant','S'));
$attach->filename='数据申请-'.$formData['realname'].'.pdf'; $attach->filename='数据申请-'.$formData['realname'].'.pdf';
/*$tr=new Zend_Mail_Transport_Smtp($this->view->config->smtp->host,
array('ssl' => $this->view->config->smtp->ssl,
'auth'=>$this->view->config->smtp->auth,
'username'=>$this->view->config->smtp->username,
'password'=>$this->view->config->smtp->password));
$mail->send($tr);*/
$mail->send(); $mail->send();
//跳转到/data/order，并提示帮助信息，告知用户已经发送EMAIL //跳转到/data/order，并提示帮助信息，告知用户已经发送EMAIL

7
application/default/controllers/WaterController.php
View File

@ -446,16 +446,9 @@ class WaterController extends DataController
$mail->setBodyText($body); $mail->setBodyText($body);
$mail->addTo($formData['email']); $mail->addTo($formData['email']);
$mail->setSubject('您在西部数据中心进行的离线申请'); $mail->setSubject('您在西部数据中心进行的离线申请');
$mail->addHeader('Reply-To', $this->view->config->service->email);
$mail->setFrom($this->view->config->service->email,'西部数据中心服务组'); $mail->setFrom($this->view->config->service->email,'西部数据中心服务组');
$attach=$mail->createAttachment($pdf->Output('applicant','S')); $attach=$mail->createAttachment($pdf->Output('applicant','S'));
$attach->filename='数据申请-'.$formData['realname'].'.pdf'; $attach->filename='数据申请-'.$formData['realname'].'.pdf';
/*$tr=new Zend_Mail_Transport_Smtp($this->view->config->smtp->host,
array('ssl' => $this->view->config->smtp->ssl,
'auth'=>$this->view->config->smtp->auth,
'username'=>$this->view->config->smtp->username,
'password'=>$this->view->config->smtp->password));
$mail->send($tr);*/
$mail->send(); $mail->send();
//跳转到/data/order，并提示帮助信息，告知用户已经发送EMAIL //跳转到/data/order，并提示帮助信息，告知用户已经发送EMAIL