From 53bb04bdcbd95a3ebe75c5c5ecca64bac71ffa4d Mon Sep 17 00:00:00 2001
From: wlx <wangliangxu@lzb.ac.cn>
Date: Wed, 23 Nov 2011 10:25:06 +0000
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E9=82=80=E8=AF=B7=E4=B8=93?=
 =?UTF-8?q?=E5=AE=B6=E7=9A=84=E6=96=B0=E6=A8=A1=E6=9D=BF=E5=8F=8A=E6=8B=92?=
 =?UTF-8?q?=E7=BB=9D=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/controllers/ReviewController.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/application/admin/controllers/ReviewController.php b/application/admin/controllers/ReviewController.php
index 09485c71..2b74ac11 100644
--- a/application/admin/controllers/ReviewController.php
+++ b/application/admin/controllers/ReviewController.php
@@ -351,14 +351,16 @@ class Admin_ReviewController extends Zend_Controller_Action
 			$sql="select realname,email,(select title from metadata where uuid='$uuid') as title from users where id='$user'";
 			$row=$this->db->fetchRow($sql);   
 								//实例化EmailText
-								$mailtp=new EmailText($this->db,'invite-expert-review',array('user'=>$row['realname'],'uuid'=>$uuid,'title'=>$row['title']));
+								$mailtp=new EmailText($this->db,'invite-expert-review',array('user'=>$row['realname'],'uuid'=>$uuid,'title'=>$row['title'],'userid'=>$user));
 								$mail=new WestdcMailer($this->view->config->smtp);
 								$mail->setBodyText($mailtp->getBody());
 								$mail->setFrom($this->view->config->service->email,'西部数据中心服务组');
 								$mail->addTo($row['email']);
 								$mail->setSubject($mailtp->getSubject());
-								$filecontent=file_get_contents("http://" . $_SERVER['HTTP_HOST'].'/data/doc/review/1/uuid/'.$uuid);
-								$mail->createAttachment($filecontent,'application/octet-stream',Zend_Mime::DISPOSITION_ATTACHMENT, Zend_Mime::ENCODING_BASE64, $row['title'].'.doc');
+								$filecontent=file_get_contents("http://" . $_SERVER['HTTP_HOST'].'/service/doc/review/1/uuid/'.$uuid);
+								$mail->createAttachment($filecontent,'application/octet-stream',Zend_Mime::DISPOSITION_ATTACHMENT, Zend_Mime::ENCODING_BASE64, $row['title'].'.doc');
+								$filecontent=file_get_contents("http://" . $_SERVER['HTTP_HOST'].'/service/pdf/uuid/'.$uuid);
+								$mail->createAttachment($filecontent,'application/octet-stream',Zend_Mime::DISPOSITION_ATTACHMENT, Zend_Mime::ENCODING_BASE64, $row['title'].'.pdf');
 								if($mail->send())
 								{
 									$this->messenger->addMessage('成功再次邀请专家:'.$row['realname']);
@@ -498,7 +500,7 @@ class Admin_ReviewController extends Zend_Controller_Action
 		$sql = "select m.id,md.uuid,md.title,u.username,u.realname,m.status from mdstatus m
 				left join metadata md on md.uuid=m.uuid
 				left join users u on u.id=m.userid
-				where u.id='$userid' $searchjoin";
+				where m.status in (0,1,2,3,4) and u.id='$userid' $searchjoin order by m.status desc";
 				
 		$re = $this->db->query($sql);
 		$rows = $re->fetchAll();