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

remove mail on data submit

This commit is contained in:
jack 2018-05-03 15:28:41 +08:00
parent 9cbbaf48f8
commit 6e24442758
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
application/admin/controllers/DataController.php
View File

@ -2712,26 +2712,26 @@ group by m.uuid,m.title,m.description) md ON md.uuid=v.uuid
$this->db->query($sql,array($u_id,$id));
//email to admin & author
$mail=new WestdcMailer($this->view->config->smtp);
$mail->setFrom($this->view->config->service->email,'西部数据中心服务组');
$mailtp=new EmailText($this->db,"metadata-release",array(
'user' => $user->username,
'uuid' => $row['uuid'],
'email'=> $user->email,
//元数据标题
'title'=> $row['title'],
'changelog'=>$changelog,
));
$mail->setBodyText($mailtp->getBody());
$mail->setSubject($mailtp->getSubject());
if($this->debug==0)
{
$mail->addTo($this->view->config->service->email);
$mail->addCc($this->view->config->service->email);
}else{
$mail->addTo($this->debug_email);
}
@$mail->send();
// $mail=new WestdcMailer($this->view->config->smtp);
// $mail->setFrom($this->view->config->service->email,'西部数据中心服务组');
// $mailtp=new EmailText($this->db,"metadata-release",array(
// 'user' => $user->username,
// 'uuid' => $row['uuid'],
// 'email'=> $user->email,
// //元数据标题
// 'title'=> $row['title'],
// 'changelog'=>$changelog,
// ));
// $mail->setBodyText($mailtp->getBody());
// $mail->setSubject($mailtp->getSubject());
// if($this->debug==0)
// {
// $mail->addTo($this->view->config->service->email);
// $mail->addCc($this->view->config->service->email);
// }else{
// $mail->addTo($this->debug_email);
// }
// @$mail->send();
$data = array("commited"=>1,"error"=>'该版本已经成功发布!');
$this->jsonexit($data);

2
application/models/Search.php
View File

@ -65,7 +65,7 @@ class Search
}
function __construct($text='')
{
require_once '/home/wlx/xunsearch/sdk/php/lib/XS.php';
$this->xs=new XS('westdc');
$this->search=$this->xs->search;
$this->terms = array();