From e24d2472b636ae65177796a5af1a38b4ec5841e7 Mon Sep 17 00:00:00 2001 From: wlx Date: Wed, 11 Jun 2014 07:35:28 +0000 Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E6=95=B0=E6=8D=AE=E4=B8=8B?= =?UTF-8?q?=E8=BD=BD=E8=AE=B0=E5=BD=95=E7=9A=84=E5=88=86=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/controllers/DownController.php | 48 ++++++++++--------- .../admin/views/scripts/down/offline.phtml | 2 - 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/application/admin/controllers/DownController.php b/application/admin/controllers/DownController.php index 7ae6be56..177d0af4 100644 --- a/application/admin/controllers/DownController.php +++ b/application/admin/controllers/DownController.php @@ -88,7 +88,7 @@ class Admin_DownController extends Zend_Controller_Action $mail->setBodyText($mailtp->getBody()); $mail->setSubject($mailtp->getSubject()); $mail->addTo($row['email']); - $mail->setFrom($this->view->config->service->email,'西部数据中心服务组'); + $mail->setFrom($this->view->config->service->email,'数据服务组'); $mail->send(); //如果是wsn数据则生成数据 @@ -126,12 +126,12 @@ class Admin_DownController extends Zend_Controller_Action unset($mail); $mail = new WestdcMailer($this->view->config->smtp); $mailtp=new EmailText($this->db,'offline-start-subject',array('user'=>$username,'datalist'=>$data,'source'=>$source)); - $mail->setFrom($this->view->config->service->email,'西部数据中心服务组'); + $mail->setFrom($this->view->config->service->email,'数据服务组'); $mail->setBodyText($mailtp->getBody()); $mail->setSubject($mailtp->getSubject()); $mail_addrs=explode(",",substr($tmp_email,1,-1)); $mail->addTo($mail_addrs); - $mail->addCc($this->view->config->service->email,'西部数据中心服务组'); + $mail->addCc($this->view->config->service->email,'数据服务组'); $mail->createAttachment($filecontent,'application/octet-stream',Zend_Mime::DISPOSITION_ATTACHMENT, Zend_Mime::ENCODING_BASE64, 'offlineapp.pdf'); $mail->send(); $data=""; @@ -150,12 +150,12 @@ class Admin_DownController extends Zend_Controller_Action unset($mail); $mail = new WestdcMailer($this->view->config->smtp); $mailtp=new EmailText($this->db,'offline-start-author',array('user'=>$username,'datalist'=>$data,'source'=>$source)); - $mail->setFrom($this->view->config->service->email,'西部数据中心服务组'); + $mail->setFrom($this->view->config->service->email,'数据服务组'); $mail->setBodyText($mailtp->getBody()); $mail->setSubject($mailtp->getSubject()); $mail_addrs=explode(",",substr($tmp_email,1,-1)); $mail->addTo($mail_addrs); - $mail->addCc($this->view->config->service->email,'西部数据中心服务组'); + $mail->addCc($this->view->config->service->email,'数据服务组'); $mail->createAttachment($filecontent,'application/octet-stream',Zend_Mime::DISPOSITION_ATTACHMENT, Zend_Mime::ENCODING_BASE64, 'offlineapp.pdf'); $mail->send(); } @@ -179,11 +179,11 @@ class Admin_DownController extends Zend_Controller_Action unset($mail); $mail = new WestdcMailer($this->view->config->smtp); $mailtp=new EmailText($this->db,'offline-start-author',array('user'=>$username,'datalist'=>$data)); - $mail->setFrom($this->view->config->service->email,'西部数据中心服务组'); + $mail->setFrom($this->view->config->service->email,'数据服务组'); $mail->setBodyText($mailtp->getBody()); $mail->setSubject($mailtp->getSubject()); $mail->addTo($tmp_email); - $mail->addCc($this->view->config->service->email,'西部数据中心服务组'); + $mail->addCc($this->view->config->service->email,'数据服务组'); $mail->createAttachment($filecontent,'application/octet-stream',Zend_Mime::DISPOSITION_ATTACHMENT, Zend_Mime::ENCODING_BASE64, 'offlineapp.pdf'); $mail->send(); $data=""; @@ -203,11 +203,11 @@ class Admin_DownController extends Zend_Controller_Action unset($mail); $mail = new WestdcMailer($this->view->config->smtp); $mailtp=new EmailText($this->db,'offline-start-author',array('user'=>$username,'datalist'=>$data)); - $mail->setFrom($this->view->config->service->email,'西部数据中心服务组'); + $mail->setFrom($this->view->config->service->email,'数据服务组'); $mail->setBodyText($mailtp->getBody()); $mail->setSubject($mailtp->getSubject()); $mail->addTo($tmp_email); - $mail->addCc($this->view->config->service->email,'西部数据中心服务组'); + $mail->addCc($this->view->config->service->email,'数据服务组'); $mail->createAttachment($filecontent,'application/octet-stream',Zend_Mime::DISPOSITION_ATTACHMENT, Zend_Mime::ENCODING_BASE64, 'offlineapp.pdf'); $mail->send(); } @@ -231,7 +231,7 @@ class Admin_DownController extends Zend_Controller_Action unset($mail); $mail = new WestdcMailer($this->view->config->smtp); $mailtp=new EmailText($this->db,'offline-start-dcadmin',array('user'=>$username,'datalist'=>$data)); - $mail->setFrom($this->view->config->service->email,'西部数据中心服务组'); + $mail->setFrom($this->view->config->service->email,'数据服务组'); $mail->setBodyText($mailtp->getBody()); $mail->setSubject($mailtp->getSubject()); $addrs=array(); @@ -239,7 +239,7 @@ class Admin_DownController extends Zend_Controller_Action $addrs[] = 'wangliangxu@lzb.ac.cn'; $addrs[] = 'wulizong@lzb.ac.cn'; $mail->addTo($addrs); - $mail->addCc($this->view->config->service->email,'西部数据中心服务组'); + $mail->addCc($this->view->config->service->email,'数据服务组'); $mail->createAttachment($filecontent,'application/octet-stream',Zend_Mime::DISPOSITION_ATTACHMENT, Zend_Mime::ENCODING_BASE64, 'offlineapp.pdf'); $mail->send(); } @@ -361,11 +361,11 @@ class Admin_DownController extends Zend_Controller_Action unset($mail); $mail = new WestdcMailer($this->view->config->smtp); $mailtp=new EmailText($this->db,'offline-start-mdadmin',array('user'=>$username,'datalist'=>$data)); - $mail->setFrom($this->view->config->service->email,'西部数据中心服务组'); + $mail->setFrom($this->view->config->service->email,'数据服务组'); $mail->setBodyText($mailtp->getBody()); $mail->setSubject($mailtp->getSubject()); $mail->addTo($tmp_email); - $mail->addCc($this->view->config->service->email,'西部数据中心服务组'); + $mail->addCc($this->view->config->service->email,'数据服务组'); $mail->createAttachment($filecontent,'application/octet-stream',Zend_Mime::DISPOSITION_ATTACHMENT, Zend_Mime::ENCODING_BASE64, 'offlineapp.pdf'); $mail->send(); $data=''; @@ -382,11 +382,11 @@ class Admin_DownController extends Zend_Controller_Action unset($mail); $mail = new WestdcMailer($this->view->config->smtp); $mailtp=new EmailText($this->db,'offline-start-mdadmin',array('user'=>$username,'datalist'=>$data)); - $mail->setFrom($this->view->config->service->email,'西部数据中心服务组'); + $mail->setFrom($this->view->config->service->email,'数据服务组'); $mail->setBodyText($mailtp->getBody()); $mail->setSubject($mailtp->getSubject()); $mail->addTo($tmp_email); - $mail->addCc($this->view->config->service->email,'西部数据中心服务组'); + $mail->addCc($this->view->config->service->email,'数据服务组'); $mail->createAttachment($filecontent,'application/octet-stream',Zend_Mime::DISPOSITION_ATTACHMENT, Zend_Mime::ENCODING_BASE64, 'offlineapp.pdf'); $mail->send(); } @@ -523,9 +523,9 @@ class Admin_DownController extends Zend_Controller_Action array('user'=>$row['username'],'datalist'=>str_replace(";","\n",$row['datalist']), 'ftpuser'=>$user->username,'ftppwd'=>$proftp->pwd,'ftptime'=>$proftp->time,'ftphost'=>$ftphost)); $mail->setBodyText($mailtp->getBody()); - $mail->setFrom($this->view->config->service->email,'西部数据中心服务组'); + $mail->setFrom($this->view->config->service->email,'数据服务组'); $mail->addTo($row['email']); - $mail->addCc($this->view->config->service->email,'西部数据中心服务组'); + $mail->addCc($this->view->config->service->email,'数据服务组'); $mail->setSubject($mailtp->getSubject()); $mail->send(); } //offline deal @@ -1025,6 +1025,7 @@ class Admin_DownController extends Zend_Controller_Action { $show=(int)$this->_getParam('show'); $delete=(int)$this->_getParam('delete'); + $submd=$this->view->config->sub->metadata; if(empty($show) && empty($delete)) { @@ -1137,13 +1138,14 @@ class Admin_DownController extends Zend_Controller_Action $show = $this->_getParam('show'); $search = $this->_getParam('search'); $keyword = $this->view->keyword = $this->_getParam('keyword'); - + $submd=$this->view->config->sub->metadata; + if(empty($show)) { $select=$this->db->select(); $select->from('dataorder as o','count(o.id) as num') - ->join('metadata as m', 'o.uuid = m.uuid', array('title','uuid')) - ->where('o.uuid = m.uuid and (o.status=0 or o.status=5)'); + ->join($submd.' as m', 'o.uuid = m.uuid', array('title','uuid')) + ->where('o.uuid = m.uuid and (o.status=0 or o.status=5)') if(!empty($search) && !empty($keyword)) { $select ->Where('m.title like ? or m.title_en like ?','%'.$keyword.'%'); @@ -1168,7 +1170,7 @@ class Admin_DownController extends Zend_Controller_Action { $select=$this->db->select(); $select->from('dataorder as o',array('ts_created','ts_created','offlineappid','onlineappid')) - ->join('metadata as m', 'o.uuid = m.uuid', array('title','uuid')) + ->join($submd.' as m', 'o.uuid = m.uuid', array('title','uuid')) ->join('users as u', 'o.userid=u.id',array('id as userid','username','realname')) ->where('m.uuid = ? and (o.status=0 or o.status=5)', $show) ->order('o.id desc'); @@ -1179,7 +1181,7 @@ class Admin_DownController extends Zend_Controller_Action Zend_View_Helper_PaginationControl::setDefaultViewPartial('pagination.phtml'); $this->view->paginator=$paginator; - $sql="select title,uuid from metadata where uuid='$show'"; + $sql="select title,uuid from $submd where uuid='$show'"; $re=$this->db->query($sql); $t=$re->fetch(); $this->view->infos=$t; @@ -1257,7 +1259,7 @@ class Admin_DownController extends Zend_Controller_Action foreach($mails as $k=>$v) { $mail=new WestdcMailer($this->view->config->smtp); - $mail->setFrom($this->view->config->service->email,'西部数据中心服务组'); + $mail->setFrom($this->view->config->service->email,'数据服务组'); $mail->setBodyText($body); $mail->setSubject($title); $mail->addTo($v['email']); diff --git a/application/admin/views/scripts/down/offline.phtml b/application/admin/views/scripts/down/offline.phtml index 906c694e..c4dcb6d7 100644 --- a/application/admin/views/scripts/down/offline.phtml +++ b/application/admin/views/scripts/down/offline.phtml @@ -34,9 +34,7 @@ table thead tr th {background:#EBF2F6;color:#444;}
添加新的离线服务记录 下载所有离线服务记录 - 自动匹配离线下载用户与网站用户 下载服务用户邮箱列表 - 下载上月服务记录(科技部上报)