From b99f34f6d58dc3ae3625a50643cf414837e683da Mon Sep 17 00:00:00 2001 From: wlx Date: Mon, 20 May 2013 22:29:47 +0000 Subject: [PATCH 01/19] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BC=95=E7=94=A8=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/default/views/scripts/heihe/view.phtml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/application/default/views/scripts/heihe/view.phtml b/application/default/views/scripts/heihe/view.phtml index 6ea73d04..4128182d 100755 --- a/application/default/views/scripts/heihe/view.phtml +++ b/application/default/views/scripts/heihe/view.phtml @@ -40,10 +40,13 @@ if ($md->title_en) echo '
'.$this->escape($md->title_en);?>

本数据引用方式数据引用帮助

datadoi) || !strpos($md->citation,$md->datadoi)) : ?>文章的引用 - escape($md->citation);?>

- datadoi) && !strpos($md->citation,$md->datadoi)) : ?> + escape($md->citation);if (strpos($md->citation,$md->datadoi)) : ?> + (下载引用：RIS格式 | RIS英文格式 | Bibtex格式 | Bibtex英文格式) + +

+ datadoi) && !strpos($md->citation,$md->datadoi)) : ?>

数据的引用authors,1,-1).'. '.$md->title.'. '.$md->publisher.', '.$md->publish_year.'. doi:'.$md->doi; + echo substr($md->authors,1,-1).'. '.$md->title.'. '.$md->publisher.', '.(empty($md->ts_published)?$md->publish_year:date('Y',strtotime($md->ts_published))).'. doi:'.$md->doi; echo ' ['.str_replace('"','',substr($md->author_en,1,-1)).'. '.$md->title_en.'. '.$md->publisher_en.', '.$md->publish_year.'. doi:'.$md->doi.']'; ?> (下载引用：RIS格式 | RIS英文格式 | Bibtex格式 | Bibtex英文格式)

ref) : ?> From f602aca71eefa4fa83fbb2b226d5f894d9ada2a8 Mon Sep 17 00:00:00 2001 From: Li Jianxuan Date: Tue, 21 May 2013 09:37:33 +0000 Subject: [PATCH 02/19] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=B0=E9=97=BB?= =?UTF-8?q?=E6=A0=8F=E7=9B=AE=E7=9A=84=E9=A1=BA=E5=BA=8F=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/controllers/NewsController.php | 36 +- .../admin/views/scripts/news/catlog.phtml | 224 ++++++------ .../admin/views/scripts/news/move.phtml | 33 ++ application/models/ArchiveCategory.php | 326 +++++++++++++++++- application/models/helper/view.php | 8 +- 5 files changed, 501 insertions(+), 126 deletions(-) create mode 100644 application/admin/views/scripts/news/move.phtml diff --git a/application/admin/controllers/NewsController.php b/application/admin/controllers/NewsController.php index 5d1770d1..772be9ab 100644 --- a/application/admin/controllers/NewsController.php +++ b/application/admin/controllers/NewsController.php @@ -8,6 +8,7 @@ class Admin_NewsController extends Zend_Controller_Action $this->messenger=$this->_helper->getHelper('FlashMessenger'); $this->view->messages = $this->messenger->getMessages(); $this->_helper->layout->setLayout('administry'); + $this->view->theme = new Theme(); } function postDispatch() { @@ -628,7 +629,40 @@ class Admin_NewsController extends Zend_Controller_Action return $newString; } - + public function moveAction() + { + $up = (int)$this->_getParam('up'); + $down = (int)$this->_getParam('down'); + + include_once('helper/view.php'); + include_once('ArchiveCategory.php'); + + if(empty($up) && empty($down)) + { + view::Post("参数错误",$this,-1); + return true; + } + + $category = new ArchiveCategory($this->db); + + if(!empty($up)) + { + $s = $category->move('up',$up); + } + if(!empty($down)) + { + $s = $category->move('down',$down); + } + + if(is_array($s)) + { + $this->view->moved = $s; + }else{ + view::Post($this,$s,-1); + } + + return true; + } } diff --git a/application/admin/views/scripts/news/catlog.phtml b/application/admin/views/scripts/news/catlog.phtml index 6dd5da93..c7bd805d 100644 --- a/application/admin/views/scripts/news/catlog.phtml +++ b/application/admin/views/scripts/news/catlog.phtml @@ -2,126 +2,128 @@ $this->headTitle($this->config->title->site); $this->headTitle('后台管理'); $this->headTitle()->setSeparator(' - '); - $this->headScript()->appendFile('/js/jquery-1.7.min.js'); - $this->headLink()->appendStylesheet('/css/admin.css'); - $this->headScript()->appendFile('/js/jquery.colorbox-min.js'); - $this->headLink()->appendStylesheet('/css/author.css'); - $this->headLink()->appendStylesheet('/css/colorbox.css'); $this->breadcrumb('首页'); $this->breadcrumb('后台首页'); $this->breadcrumb('新闻中心'); $this->breadcrumb('栏目管理'); + $this->theme->AppendPlus($this,"colorbox"); ?> -
-partial('news/left.phtml'); ?> -
-
-msg or $this->messages) :?> -
-msg) : ?> -

msg; ?>

-messages): foreach($this->messages as $msg): ?> -

- -
- - - - - - - - - - - - catlogs)) - { - $top = 0; - $deep = 0; - foreach($this->catlogs as $k=>$v) - { - if($v[$this->deepField]>0) - { - $style = "text-indent:". $v[$this->deepField]*12 ."px;"; - }else{ - $style = ""; - } - echo ' - - - - - '; - } - - }else{ - echo ''; - } - ?> - -
栏目名称栏目类型栏目管理
- - '.$v['ptype'].' - - 浏览 - 文档 - 编辑 - 删除
暂无数据
-
- + + + diff --git a/application/default/views/scripts/author/fund.phtml b/application/default/views/scripts/author/fund.phtml index 4b5b96e7..3fbe7ad7 100644 --- a/application/default/views/scripts/author/fund.phtml +++ b/application/default/views/scripts/author/fund.phtml @@ -1,163 +1,167 @@ -headTitle($this->config->title->site); -$this->headTitle($this->config->title->author); -$this->headTitle()->setSeparator(' - '); -$this->breadcrumb('首页'); -$this->breadcrumb('数据作者'); -$this->headLink()->appendStylesheet('/css/author.css'); -$this->breadcrumb('申请成为元数据作者'); -$this->breadcrumb()->setSeparator(' > '); -$this->theme->AppendPlus($this,'colorbox'); -$this->theme->AppendPlus($this,'admin_plugin'); -?> - -
-
- partial('author/navi.phtml'); ?> -
-
-
- -
- md)) { ?> -
- ct)) { ?> - 为此数据添加项目 - - 返回 -
点击“添加此项目”即可将项目添加到元数据
- -

《md['title'] ?>》 的支持项目

-
-
- -
-
-
- - -
-
-
- error)) { ?> - AlertType)) $AlertType = "alert-error";else $AlertType = $this->AlertType;?> -
- × - error)) { ?>

error ?>

-
    - error as $v) { ?> -
    • - -
- -
- - msg)) { ?> -
- × - msg ?> -
- jump_url)) { ?> - - - -
- paginator)): ?> - - - - - - - md) { ?> - - - - - - - - - - paginator as $item): - $autoindex++;?> - md)) { ?> - - - - - - - - md) { ?> - ct) { ?> - - - - - - - - - - - - -
名称编号类型排序英文标题英文类型操作
- md)) { ?> - 编辑 - 删除 - - ct)) { ?> - 排序 - 移除 - - 添加此项目 - - -
- -
paginator; ?>
-
- -
-
- - +headTitle($this->config->title->site); +$this->headTitle($this->config->title->author); +$this->headTitle()->setSeparator(' - '); +$this->breadcrumb('首页'); +$this->breadcrumb('数据作者'); +$this->headLink()->appendStylesheet('/css/author.css'); +$this->breadcrumb('申请成为元数据作者'); +$this->breadcrumb()->setSeparator(' > '); +$this->theme->AppendPlus($this,'colorbox'); +$this->theme->AppendPlus($this,'admin_plugin'); +?> + +
+
+ partial('author/navi.phtml'); ?> +
+
+
+ +
+ md)) { ?> +
+ ct)) { ?> + 为此数据添加项目 + + 返回 +
点击“添加此项目”即可将项目添加到元数据
+ +

《md['title'] ?>》 的支持项目

+
+
+ +
+
+
+ + +
+
+
+ error)) { ?> + AlertType)) $AlertType = "alert-error";else $AlertType = $this->AlertType;?> +
+ × + error)) { ?>

error ?>

+
    + error as $v) { ?> +
    • + +
+ +
+ + msg)) { ?> +
+ × + msg ?> +
+ jump_url)) { ?> + + + +
+ paginator)): ?> + + + + + + + md) { ?> + + + + + + + + + + paginator as $item): + $autoindex++;?> + md)) { ?> + + + + + + + + md) { ?> + ct) { ?> + + + + + + + + + + + + +
名称编号类型排序英文标题英文类型操作
+ md)) { ?> + 编辑 + 删除 + + ct)) { ?> + 排序 + 移除 + + 添加此项目 + + +
+ +
paginator; ?>
+
+ +
+
+ + diff --git a/application/default/views/scripts/author/navi.phtml b/application/default/views/scripts/author/navi.phtml index 97828358..7aa38b97 100644 --- a/application/default/views/scripts/author/navi.phtml +++ b/application/default/views/scripts/author/navi.phtml @@ -1,20 +1,20 @@ -
- +
+
\ No newline at end of file diff --git a/application/models/data/Fund.php b/application/models/data/Fund.php index df9b9e28..418c5252 100644 --- a/application/models/data/Fund.php +++ b/application/models/data/Fund.php @@ -15,15 +15,34 @@ class Fund extends Zend_Controller_Plugin_Abstract $this->auth = $auth; } - function fetch($uuid = "",$include = true,$uid=0){ + function fetch($uuid = "",$include = true,$uid=0,$keyword=""){ if(empty($uuid)) { - if(empty($uid)) + $wheresql = array(); + + if(!empty($keyword)) { - $sql = "SELECT * FROM ".$this->tbl_fund." ORDER BY id desc"; - }else{ - $sql = "SELECT * FROM ".$this->tbl_fund." WHERE userid=$uid ORDER BY id desc"; + if(preg_match("/\'/",$keyword)) + { + $keyword = preg_replace("/\'/","''",$keyword); + } + $wheresql[] = " title LIKE '%$keyword%'"; } + + if(!empty($uid)) + { + $wheresql[] = " userid=$uid "; + } + + if(count($wheresql)>0) + { + $wheresql = " WHERE ".join(" AND ",$wheresql); + }else{ + $wheresql = ""; + } + + $sql = "SELECT * FROM ".$this->tbl_fund." $wheresql ORDER BY id desc"; + $rs = $this->db->query($sql); $rows = $rs->fetchAll(); return $rows; @@ -44,6 +63,15 @@ class Fund extends Zend_Controller_Plugin_Abstract { $wheresql[] = " f.userid='$uid' "; } + + if(!empty($keyword)) + { + if(preg_match("/\'/",$keyword)) + { + $keyword = preg_replace("/\'/","''",$keyword); + } + $wheresql[] = " f.title LIKE '%$keyword%'"; + } if(count($wheresql)>0) { @@ -52,7 +80,7 @@ class Fund extends Zend_Controller_Plugin_Abstract $wheresql = ""; } - if($include) + if($include === true) { $sql = "SELECT f.*,mf.place,mf.id as mfid FROM ".$this->tbl_fund." f LEFT JOIN ".$this->tbl_mdfund." mf ON mf.fid=f.id @@ -67,6 +95,43 @@ class Fund extends Zend_Controller_Plugin_Abstract } } + function fetchFormData($uid,$keyword){ + $wheresql = array(); + + if(!empty($uid) && is_int($uid)) + { + $wheresql[] = " f.userid='$uid' "; + } + + if(!empty($keyword)) + { + if(preg_match("/\'/",$keyword)) + { + $keyword = preg_replace("/\'/","''",$keyword); + } + $wheresql[] = " f.title LIKE '%$keyword%'"; + } + + $wheresql[] = " md.title IS NOT NULL "; + + if(count($wheresql)>0) + { + $wheresql = " WHERE ".join(" AND ",$wheresql); + }else{ + $wheresql = ""; + } + + $sql = "SELECT f.*,mf.place,mf.id as mfid,md.title as mdtitle,md.uuid FROM ".$this->tbl_fund." f + LEFT JOIN ".$this->tbl_mdfund." mf ON mf.fid=f.id + LEFT JOIN metadata md ON md.uuid=mf.uuid + $wheresql + ORDER BY mf.place"; + + $rs = $this->db->query($sql); + $rows = $rs->fetchAll(PDO::FETCH_BOTH); + return $rows; + } + function add($data) { include_once("helper/dbh.php"); @@ -205,6 +270,10 @@ class Fund extends Zend_Controller_Plugin_Abstract $search = ""; if(!empty($keyword)) { + if(preg_match("/\'/",$keyword)) + { + $keyword = preg_replace("/\'/","''",$keyword); + } $search = " AND md.title LIKE '%$keyword%' "; } $sql = "SELECT md.title,mf.id FROM ".$this->tbl_mdfund." mf From 8234d6e625ac1a6803250bce2793c82686506b04 Mon Sep 17 00:00:00 2001 From: Li Jianxuan Date: Wed, 22 May 2013 09:13:50 +0000 Subject: [PATCH 08/19] =?UTF-8?q?#490=20=E6=B7=BB=E5=8A=A0=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E6=95=B0=E6=8D=AE=E7=9A=84=E6=9F=A5=E7=9C=8B=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../default/controllers/AuthorController.php | 24 ++--- .../views/scripts/author/fund-data-view.phtml | 100 ++++++++++++++++++ .../views/scripts/author/fund-data.phtml | 14 +-- application/models/data/Fund.php | 22 +++- 4 files changed, 139 insertions(+), 21 deletions(-) create mode 100644 application/default/views/scripts/author/fund-data-view.phtml diff --git a/application/default/controllers/AuthorController.php b/application/default/controllers/AuthorController.php index c2a58737..e8240980 100644 --- a/application/default/controllers/AuthorController.php +++ b/application/default/controllers/AuthorController.php @@ -3836,19 +3836,19 @@ class AuthorController extends Zend_Controller_Action if($ac == 'data') { $this->_helper->viewRenderer('fund-data'); - $uuid = $this->_getParam('uuid'); $this->view->q = $q = $this->_getParam('q'); - if(empty($uuid)) - { - $rows = $fund->fetchFormData($uid,$q); - view::addPaginator($rows,$this->view,$this->_request); - }else{ - include('data/Metadata.php'); - $md = new Metadata($this->db); - $this->view->md = $md->view($uuid); - $rows = $fund->fetch($uuid); - view::addPaginator($rows,$this->view,$this->_request); - } + $rows = $fund->fetchFormData(true,$uid,$q); + view::addPaginator($rows,$this->view,$this->_request); + return true; + } + if($ac == 'dataview') + { + $this->_helper->viewRenderer('fund-data-view'); + $this->view->q = $q = $this->_getParam('q'); + $id = $this->_getParam('id'); + $this->view->fund = $fund->view($id); + $rows = $fund->fetchFormData($id,$uid,$q); + view::addPaginator($rows,$this->view,$this->_request); return true; } diff --git a/application/default/views/scripts/author/fund-data-view.phtml b/application/default/views/scripts/author/fund-data-view.phtml new file mode 100644 index 00000000..5fe7bd01 --- /dev/null +++ b/application/default/views/scripts/author/fund-data-view.phtml @@ -0,0 +1,100 @@ +headTitle($this->config->title->site); +$this->headTitle($this->config->title->author); +$this->headTitle()->setSeparator(' - '); +$this->breadcrumb('首页'); +$this->breadcrumb('数据作者'); +$this->headLink()->appendStylesheet('/css/author.css'); +$this->breadcrumb('申请成为元数据作者'); +$this->breadcrumb()->setSeparator(' > '); +$this->theme->AppendPlus($this,'colorbox'); +$this->theme->AppendPlus($this,'admin_plugin'); +?> + +
+
+ partial('author/navi.phtml'); ?> +
+
+ + fund)) { ?> +
+

fund['title'] ?> 的相关数据

+
+
+ +
+
+
+ + +
+
+
+ error)) { ?> + AlertType)) $AlertType = "alert-error";else $AlertType = $this->AlertType;?> +
+ × + error)) { ?>

error ?>

+
    + error as $v) { ?> +
    • + +
+ +
+ + msg)) { ?> +
+ × + msg ?> +
+ jump_url)) { ?> + + + +
+ paginator)): ?> + + + + + + + + + paginator as $item): + $autoindex++;?> + + + + + + +
数据操作
+ 移除 +
+ +
paginator; ?>
+
+ +
+
+ + diff --git a/application/default/views/scripts/author/fund-data.phtml b/application/default/views/scripts/author/fund-data.phtml index dd453e5a..73dbcf53 100644 --- a/application/default/views/scripts/author/fund-data.phtml +++ b/application/default/views/scripts/author/fund-data.phtml @@ -72,9 +72,10 @@ table thead tr th {background:#EBF2F6;} - - - + + + + @@ -87,11 +88,12 @@ table thead tr th {background:#EBF2F6;} - - + + + diff --git a/application/models/data/Fund.php b/application/models/data/Fund.php index 418c5252..6d37d2a0 100644 --- a/application/models/data/Fund.php +++ b/application/models/data/Fund.php @@ -95,7 +95,7 @@ class Fund extends Zend_Controller_Plugin_Abstract } } - function fetchFormData($uid,$keyword){ + function fetchFormData($count = true,$uid,$keyword){ $wheresql = array(); if(!empty($uid) && is_int($uid)) @@ -112,6 +112,11 @@ class Fund extends Zend_Controller_Plugin_Abstract $wheresql[] = " f.title LIKE '%$keyword%'"; } + if($count !== true) + { + $wheresql[] = " f.id=$count "; + } + $wheresql[] = " md.title IS NOT NULL "; if(count($wheresql)>0) @@ -121,11 +126,22 @@ class Fund extends Zend_Controller_Plugin_Abstract $wheresql = ""; } - $sql = "SELECT f.*,mf.place,mf.id as mfid,md.title as mdtitle,md.uuid FROM ".$this->tbl_fund." f + if($count === true) + { + $sql = "SELECT f.*,count(md.uuid) as mds FROM ".$this->tbl_fund." f LEFT JOIN ".$this->tbl_mdfund." mf ON mf.fid=f.id LEFT JOIN metadata md ON md.uuid=mf.uuid $wheresql - ORDER BY mf.place"; + GROUP BY f.id"; + + }else{ + $sql = "SELECT mf.id as mfid,md.title as mdtitle,md.uuid FROM ".$this->tbl_fund." f + LEFT JOIN ".$this->tbl_mdfund." mf ON mf.fid=f.id + LEFT JOIN metadata md ON md.uuid=mf.uuid + $wheresql + GROUP BY md.title,md.uuid,mf.id + "; + } $rs = $this->db->query($sql); $rows = $rs->fetchAll(PDO::FETCH_BOTH); From d33717621b4713b327ee050e9bc19102a2459519 Mon Sep 17 00:00:00 2001 From: Li Jianxuan Date: Thu, 23 May 2013 02:28:54 +0000 Subject: [PATCH 09/19] =?UTF-8?q?#490=20=E5=90=8E=E5=8F=B0=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=E6=95=B0=E6=8D=AE=E6=94=AF=E6=8C=81=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E6=97=B6=E5=9C=A8=E6=96=B0=E9=80=89=E9=A1=B9=E5=8D=A1=E6=98=BE?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/views/scripts/data/fund.phtml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/application/admin/views/scripts/data/fund.phtml b/application/admin/views/scripts/data/fund.phtml index 1964f2b4..cc5b694c 100644 --- a/application/admin/views/scripts/data/fund.phtml +++ b/application/admin/views/scripts/data/fund.phtml @@ -19,8 +19,11 @@ table thead tr th {background:#EBF2F6;}
md)) { ?> From 70a02a9d05c96a9878af864c2056cbd16c6fec67 Mon Sep 17 00:00:00 2001 From: Li Jianxuan Date: Thu, 23 May 2013 08:56:59 +0000 Subject: [PATCH 10/19] =?UTF-8?q?#490=20=E5=90=8E=E5=8F=B0=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E4=BA=86=E6=94=AF=E6=8C=81=E9=A1=B9=E7=9B=AE=E7=9A=84?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=9B=B8=E5=85=B3=E6=9F=A5=E7=9C=8B=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/controllers/DataController.php | 20 ++++ .../views/scripts/data/fund-data-list.phtml | 113 ++++++++++++++++++ .../views/scripts/data/fund-data-view.phtml | 100 ++++++++++++++++ .../admin/views/scripts/data/fund.phtml | 1 + 4 files changed, 234 insertions(+) create mode 100644 application/admin/views/scripts/data/fund-data-list.phtml create mode 100644 application/admin/views/scripts/data/fund-data-view.phtml diff --git a/application/admin/controllers/DataController.php b/application/admin/controllers/DataController.php index 24428cc7..ea300a16 100755 --- a/application/admin/controllers/DataController.php +++ b/application/admin/controllers/DataController.php @@ -3410,6 +3410,26 @@ class Admin_DataController extends Zend_Controller_Action return true; } + if($ac == 'datalist') + { + $this->_helper->viewRenderer('fund-data-list'); + $this->view->q = $q = $this->_getParam('q'); + $rows = $fund->fetchFormData(true,0,$q); + view::addPaginator($rows,$this->view,$this->_request); + return true; + } + + if($ac == 'dataview') + { + $this->_helper->viewRenderer('fund-data-view'); + $this->view->q = $q = $this->_getParam('q'); + $id = $this->_getParam('id'); + $this->view->fund = $fund->view($id); + $rows = $fund->fetchFormData($id,0,$q); + view::addPaginator($rows,$this->view,$this->_request); + return true; + } + if($ac == "add") { $this->_helper->viewRenderer('fund-add'); diff --git a/application/admin/views/scripts/data/fund-data-list.phtml b/application/admin/views/scripts/data/fund-data-list.phtml new file mode 100644 index 00000000..478a32a0 --- /dev/null +++ b/application/admin/views/scripts/data/fund-data-list.phtml @@ -0,0 +1,113 @@ +headTitle($this->config->title->site); +$this->headTitle($this->config->title->author); +$this->headTitle()->setSeparator(' - '); +$this->breadcrumb('首页'); +$this->headLink()->appendStylesheet('/css/author.css'); +$this->breadcrumb()->setSeparator(' > '); +$this->theme->AppendPlus($this,'colorbox'); +$this->theme->AppendPlus($this,'admin_plugin'); +?> + +
+
+ partial('data/left.phtml'); ?> +
+
+ + md)) { ?> +
+ ct)) { ?> + 为此数据添加项目 + + 返回 +
点击“添加此项目”即可将项目添加到元数据
+ +

《md['title'] ?>》 的支持项目

+
+
+ +
+
+
+ + + +
+
+ error)) { ?> + AlertType)) $AlertType = "alert-error";else $AlertType = $this->AlertType;?> +
+ × + error)) { ?>

error ?>

+
    + error as $v) { ?> +
    • + +
+ +
+ + msg)) { ?> +
+ × + msg ?> +
+ jump_url)) { ?> + + + +
+ paginator)): ?> +
数据名称编号名称项目编号项目类型数据个数 操作
- 移除 + 查看数据
+ + + + + + + + + + + paginator as $item): + $autoindex++;?> + md)) { ?> + + + + + + + + + + + + +
名称项目编号项目类型数据个数操作
+ 查看数据 +
+ +
paginator; ?>
+
+ + + + + diff --git a/application/admin/views/scripts/data/fund-data-view.phtml b/application/admin/views/scripts/data/fund-data-view.phtml new file mode 100644 index 00000000..5fe7bd01 --- /dev/null +++ b/application/admin/views/scripts/data/fund-data-view.phtml @@ -0,0 +1,100 @@ +headTitle($this->config->title->site); +$this->headTitle($this->config->title->author); +$this->headTitle()->setSeparator(' - '); +$this->breadcrumb('首页'); +$this->breadcrumb('数据作者'); +$this->headLink()->appendStylesheet('/css/author.css'); +$this->breadcrumb('申请成为元数据作者'); +$this->breadcrumb()->setSeparator(' > '); +$this->theme->AppendPlus($this,'colorbox'); +$this->theme->AppendPlus($this,'admin_plugin'); +?> + +
+
+ partial('author/navi.phtml'); ?> +
+
+
+ +
+ fund)) { ?> +
+

fund['title'] ?> 的相关数据

+
+
+ +
+
+
+ + +
+
+
+ error)) { ?> + AlertType)) $AlertType = "alert-error";else $AlertType = $this->AlertType;?> +
+ × + error)) { ?>

error ?>

+
    + error as $v) { ?> +
    • + +
+ +
+ + msg)) { ?> +
+ × + msg ?> +
+ jump_url)) { ?> + + + +
+ paginator)): ?> + + + + + + + + + paginator as $item): + $autoindex++;?> + + + + + + +
数据操作
+ 移除 +
+ +
paginator; ?>
+
+ +
+
+ + diff --git a/application/admin/views/scripts/data/fund.phtml b/application/admin/views/scripts/data/fund.phtml index cc5b694c..aab2a9f3 100644 --- a/application/admin/views/scripts/data/fund.phtml +++ b/application/admin/views/scripts/data/fund.phtml @@ -19,6 +19,7 @@ table thead tr th {background:#EBF2F6;}
    +
  • 数据相关
  • md)) { ?>class="active">所有项目
  • 添加新项目
    • md)) { ?> From 37233cf6a11785ff0ce3d5514b74b9907a9a0de8 Mon Sep 17 00:00:00 2001 From: wlx Date: Fri, 24 May 2013 00:35:07 +0000 Subject: [PATCH 11/19] =?UTF-8?q?#493,=20=E4=BF=AE=E5=A4=8D=E5=85=83?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BC=96=E8=BE=91=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/views/scripts/review/myreview.phtml | 2 +- application/models/data/Review.php | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/application/admin/views/scripts/review/myreview.phtml b/application/admin/views/scripts/review/myreview.phtml index e646617a..28664cac 100644 --- a/application/admin/views/scripts/review/myreview.phtml +++ b/application/admin/views/scripts/review/myreview.phtml @@ -47,7 +47,7 @@ table thead tr th {background:#EBF2F6;color:#444;} paginator as $item): ?> [ - 编辑 | + 编辑 | 版本 ] Date: Fri, 24 May 2013 01:40:14 +0000 Subject: [PATCH 12/19] =?UTF-8?q?#494,=20=E5=AE=9E=E7=8E=B0=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E7=9A=84=E5=8F=82=E8=80=83=E6=96=87=E7=8C=AE=E6=94=AF?= =?UTF-8?q?=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/controllers/DataController.php | 2 +- .../views/scripts/data/referenceadd.phtml | 5 +- .../views/scripts/data/referenceadd.phtml~ | 75 ++++++++++++------- application/models/ReferenceForm.php | 2 +- 4 files changed, 55 insertions(+), 29 deletions(-) diff --git a/application/admin/controllers/DataController.php b/application/admin/controllers/DataController.php index ea300a16..ff4e9645 100755 --- a/application/admin/controllers/DataController.php +++ b/application/admin/controllers/DataController.php @@ -949,7 +949,7 @@ class Admin_DataController extends Zend_Controller_Action } //添加 else if($show){ - $sql = "select mr.id as mdid,mr.refid,r.reference,md.title,md.uuid FROM mdref mr + $sql = "select mr.id as mdid,mr.refid,r.reference,md.title,md.uuid,mr.place FROM mdref mr left join metadata md on md.uuid=mr.uuid left join reference r on r.id=mr.refid where mr.uuid='$show'; diff --git a/application/admin/views/scripts/data/referenceadd.phtml b/application/admin/views/scripts/data/referenceadd.phtml index 163ad3ca..084be6f3 100644 --- a/application/admin/views/scripts/data/referenceadd.phtml +++ b/application/admin/views/scripts/data/referenceadd.phtml @@ -39,7 +39,10 @@ if($this->type == 'dc')
    -
    + + + +
     
    headTitle($this->config->title->site); - $this->headTitle('后台管理'); - $this->headTitle()->setSeparator(' - '); - $this->headLink()->appendStylesheet('/css/admin.css'); - $this->breadcrumb('首页'); - $this->breadcrumb('后台首页'); - $this->breadcrumb('数据管理'); - $this->breadcrumb('特色推荐管理'); - $this->breadcrumb()->setSeparator(' > '); -?> -
    -partial('data/left.phtml'); ?> -
    -
    -msg or $this->messages) :?> -
    -msg) : ?> -

    msg; ?>

    -messages): foreach($this->messages as $msg): ?> -

    - -
    - -添加新的数据文献 -form; ?> +headTitle($this->config->title->site); + $this->headTitle('后台管理'); + $this->headTitle()->setSeparator(' - '); + $this->headLink()->appendStylesheet('/css/admin.css'); + $this->breadcrumb('首页'); + $this->breadcrumb('后台首页'); + $this->breadcrumb('数据管理'); + $this->breadcrumb('数据文献管理'); + $this->breadcrumb()->setSeparator(' > '); +?> +
    +partial('data/left.phtml'); ?> +
    +
    +msg or $this->messages) :?> +
    +msg) : ?> +

    msg; ?>

    +messages): foreach($this->messages as $msg): ?> +

    + +
    + +添加新的数据文献 + | 添加数据中心文献 + | 导入数据文献文件 + | 查看数据中心文献 +type == 'dc') +{?> +
    + +
    +
    +
    + + +
    +
    +
    + + +
    +
     
    +
    +form; ?>
    \ No newline at end of file diff --git a/application/models/ReferenceForm.php b/application/models/ReferenceForm.php index efa66ce9..cb776311 100644 --- a/application/models/ReferenceForm.php +++ b/application/models/ReferenceForm.php @@ -22,7 +22,7 @@ class ReferenceForm extends Zend_Form $link->setLabel('URL(optional)') ->addFilter('StringTrim'); $reftype=new Zend_Form_Element_Radio('reftype'); - $reftype->setRequired(true)->setLabel('文献类型')->setMultiOptions(array('0'=>'作者文献','1'=>'用户文献'))->setValue(0); + $reftype->setRequired(true)->setLabel('文献类型')->setMultiOptions(array('0'=>'作者文献','1'=>'用户文献','2'=>'数据的参考文献'))->setValue(0); $submit = new Zend_Form_Element_Submit('submit'); $submit->setAttrib('id', 'submitbutton')->setLabel('发送'); From ebd82ccbe90b0726f761f340f80c3dc6f71551b8 Mon Sep 17 00:00:00 2001 From: wlx Date: Fri, 24 May 2013 01:40:55 +0000 Subject: [PATCH 13/19] remove the unused file --- .../views/scripts/data/referenceadd.phtml~ | 50 ------------------- 1 file changed, 50 deletions(-) delete mode 100644 application/admin/views/scripts/data/referenceadd.phtml~ diff --git a/application/admin/views/scripts/data/referenceadd.phtml~ b/application/admin/views/scripts/data/referenceadd.phtml~ deleted file mode 100644 index aa297424..00000000 --- a/application/admin/views/scripts/data/referenceadd.phtml~ +++ /dev/null @@ -1,50 +0,0 @@ -headTitle($this->config->title->site); - $this->headTitle('后台管理'); - $this->headTitle()->setSeparator(' - '); - $this->headLink()->appendStylesheet('/css/admin.css'); - $this->breadcrumb('首页'); - $this->breadcrumb('后台首页'); - $this->breadcrumb('数据管理'); - $this->breadcrumb('数据文献管理'); - $this->breadcrumb()->setSeparator(' > '); -?> -
    -partial('data/left.phtml'); ?> -
    -
    -msg or $this->messages) :?> -
    -msg) : ?> -

    msg; ?>

    -messages): foreach($this->messages as $msg): ?> -

    - -
    - -添加新的数据文献 - | 添加数据中心文献 - | 导入数据文献文件 - | 查看数据中心文献 -type == 'dc') -{?> -
    - -
    -
    -
    - - -
    -
    -
    - - -
    -
     
    -
    -form; ?> -
    \ No newline at end of file From ec18b2737bb7aa6da6b11ce1a322e5702c357503 Mon Sep 17 00:00:00 2001 From: Li Jianxuan Date: Fri, 24 May 2013 02:34:47 +0000 Subject: [PATCH 14/19] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=B8=AD=E7=9A=84=E9=93=BE=E6=8E=A5=E9=94=99?= =?UTF-8?q?=E8=AF=AF=EF=BC=8C=E6=B7=BB=E5=8A=A0=E6=97=A0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=97=B6=E9=A1=B5=E9=9D=A2=E4=B8=8A=E7=9A=84=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E6=96=87=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/views/scripts/data/fund-add.phtml | 1 + .../admin/views/scripts/data/fund-data-list.phtml | 10 +++++----- .../admin/views/scripts/data/fund-data-view.phtml | 6 +++--- application/admin/views/scripts/data/fund.phtml | 8 +++++++- application/default/views/scripts/author/fund.phtml | 6 ++++++ 5 files changed, 22 insertions(+), 9 deletions(-) diff --git a/application/admin/views/scripts/data/fund-add.phtml b/application/admin/views/scripts/data/fund-add.phtml index a159c051..1100ff4d 100644 --- a/application/admin/views/scripts/data/fund-add.phtml +++ b/application/admin/views/scripts/data/fund-add.phtml @@ -16,6 +16,7 @@ $this->theme->AppendPlus($this,'colorbox');
    diff --git a/application/admin/views/scripts/data/fund-data-list.phtml b/application/admin/views/scripts/data/fund-data-list.phtml index 478a32a0..165908c7 100644 --- a/application/admin/views/scripts/data/fund-data-list.phtml +++ b/application/admin/views/scripts/data/fund-data-list.phtml @@ -12,15 +12,15 @@ $this->theme->AppendPlus($this,'admin_plugin'); table thead tr th {background:#EBF2F6;}
    -
    +
    partial('data/left.phtml'); ?>
    -
    +
    md)) { ?> diff --git a/application/admin/views/scripts/data/fund-data-view.phtml b/application/admin/views/scripts/data/fund-data-view.phtml index 5fe7bd01..0dfd40d8 100644 --- a/application/admin/views/scripts/data/fund-data-view.phtml +++ b/application/admin/views/scripts/data/fund-data-view.phtml @@ -20,9 +20,9 @@ table thead tr th {background:#EBF2F6;}
    diff --git a/application/admin/views/scripts/data/fund.phtml b/application/admin/views/scripts/data/fund.phtml index aab2a9f3..75da7fc0 100644 --- a/application/admin/views/scripts/data/fund.phtml +++ b/application/admin/views/scripts/data/fund.phtml @@ -23,7 +23,7 @@ table thead tr th {background:#EBF2F6;}
  • md)) { ?>class="active">所有项目
  • 添加新项目
    • md)) { ?> -
  • 按数据查看
    • +
  • 按数据查看
@@ -128,6 +128,12 @@ table thead tr th {background:#EBF2F6;} + + md)) { ?> + 暂无数据，点击标题右侧添加按钮为此数据添加项目 + + 暂无数据 +
paginator; ?>
diff --git a/application/default/views/scripts/author/fund.phtml b/application/default/views/scripts/author/fund.phtml index 3fbe7ad7..3fbe0d9e 100644 --- a/application/default/views/scripts/author/fund.phtml +++ b/application/default/views/scripts/author/fund.phtml @@ -126,6 +126,12 @@ table thead tr th {background:#EBF2F6;} + + md)) { ?> + 暂无数据，点击标题右侧添加按钮为此数据添加项目 + + 暂无数据 +
paginator; ?>
From ebe72051246cd96268615d48b88464ecaa73b3a9 Mon Sep 17 00:00:00 2001 From: wlx Date: Fri, 24 May 2013 08:37:35 +0000 Subject: [PATCH 15/19] change ftp to ftp2.westgis.ac.cn --- .../default/controllers/HeiheController.php | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/application/default/controllers/HeiheController.php b/application/default/controllers/HeiheController.php index fcdc94a1..49b2491b 100644 --- a/application/default/controllers/HeiheController.php +++ b/application/default/controllers/HeiheController.php @@ -509,7 +509,7 @@ class HeiheController extends DataController // 2. 保存变化记录 save changelog & userid for the latest version $sql = "UPDATE mdversion SET changelog=?,userid=? WHERE id in (select id from mdversion where uuid=? order by ts_created desc limit 1)"; $this->db->query($sql,array($changelog,$u_id,$row['uuid'])); - file_get_contents("http://ftp1.westgis.ac.cn/proftp_upload.php?uuid=".$row['uuid']."&filelist=1"); + file_get_contents("http://ftp2.westgis.ac.cn/proftp_upload.php?uuid=".$row['uuid']."&filelist=1"); //自动添加数据分类为黑河 $sql="insert into datasource (uuid,sourceid) values(?,1)"; $sth=$this->db->prepare($sql); @@ -613,8 +613,11 @@ class HeiheController extends DataController //ftp路径 $homedir = "/disk1/WestDC/upload/".$uuid."/"; + //ftp用户表 + $ftptable=' pureftp ';//ftp2.westgis.ac.cn - $sql = "SELECT * FROM proftpusers WHERE userid='$uname' ORDER BY pkid DESC"; + //$sql = "SELECT * FROM proftpusers WHERE userid='$uname' ORDER BY pkid DESC"; + $sql = "SELECT * FROM $ftptable WHERE userid='$uname' ORDER BY pkid DESC"; $sth = $this->db->prepare($sql); $sth->execute(); $row = $sth->fetch(); @@ -624,7 +627,7 @@ class HeiheController extends DataController //$old=umask(0); //@mkdir($homedir,0777); //umask($old); - $page=file_get_contents('http://ftp1.westgis.ac.cn/proftp_upload.php?uuid='.$uuid); + $page=file_get_contents('http://ftp2.westgis.ac.cn/proftp_upload.php?uuid='.$uuid); if (!empty($page)) die($page);//there are errors in visit ftp page @@ -642,14 +645,15 @@ class HeiheController extends DataController return true; }else{ - $uid = 109; + $uid = 1002; $gid = 1002; $passwd = $this->genRandomString(16); //$sql = "UPDATE proftpusers SET passwd=?,uid=?,gid=?,homedir=? WHERE userid=?"; //$sth = $this->db->prepare($sql); //$rs = $sth->execute(array($passwd,$uid,$gid,$homedir,$uname)); - $sql="update proftpusers SET passwd='".$passwd."',uid=".$uid.",gid=".$gid.",homedir='".$homedir."' WHERE userid='".$uname."'"; + //$sql="update proftpusers SET passwd='".$passwd."',uid=".$uid.",gid=".$gid.",homedir='".$homedir."' WHERE userid='".$uname."'"; + $sql="update ".$ftptable." SET passwd='".$passwd."',uid=".$uid.",gid=".$gid.",homedir='".$homedir."' WHERE userid='".$uname."'"; $rs=$this->db->query($sql); if($rs) { @@ -671,14 +675,15 @@ class HeiheController extends DataController } else{ - $uid = 109; + $uid = 1002; $gid = 1002; $passwd = $this->genRandomString(16); //$sql = "INSERT INTO proftpusers (userid,passwd,uid,gid,homedir) VALUES (?,?,?,?,?)"; //$sth = $this->db->prepare($sql); //$rs = $sth->execute(array($uname,$passwd,$uid,$gid,$homedir)); - $sql="insert into proftpusers (userid,passwd,uid,gid,homedir) values('".$uname."','".$passwd."',109,1002,'".$homedir."')"; + //$sql="insert into proftpusers (userid,passwd,uid,gid,homedir) values('".$uname."','".$passwd."',109,1002,'".$homedir."')"; + $sql="insert into ".$ftptalbe." (userid,passwd,uid,gid,homedir) values('".$uname."','".$passwd."',1002,1002,'".$homedir."')"; $rs=$this->db->query($sql); if($rs) { From 13296214af81c9f0a0c1a34765478655ebb01e55 Mon Sep 17 00:00:00 2001 From: wlx Date: Fri, 24 May 2013 08:39:32 +0000 Subject: [PATCH 16/19] chagne ftp1 to ftp2 --- application/default/views/scripts/heihe/submit-unsubmit.phtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/default/views/scripts/heihe/submit-unsubmit.phtml b/application/default/views/scripts/heihe/submit-unsubmit.phtml index de3271a2..db1f2755 100644 --- a/application/default/views/scripts/heihe/submit-unsubmit.phtml +++ b/application/default/views/scripts/heihe/submit-unsubmit.phtml @@ -97,7 +97,7 @@ function getFtp(uuid){ { if(data.statu > 0) { - var html = '

临时FTP帐号信息(此帐号仅对应当前数据集！)

ftp://ftp1.westgis.ac.cn/

'+ + var html = '

临时FTP帐号信息(此帐号仅对应当前数据集！)

ftp://ftp2.westgis.ac.cn/

'+ '

用户名：'+data.user+ '

密码：'+data.passwd+'

' +'

或直接点击此链接

'; From 170df8fbeabf79702c5f035ab9cf8d88a4b4e283 Mon Sep 17 00:00:00 2001 From: wlx Date: Fri, 24 May 2013 08:48:52 +0000 Subject: [PATCH 17/19] fix spell error --- application/default/controllers/HeiheController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/default/controllers/HeiheController.php b/application/default/controllers/HeiheController.php index 49b2491b..6b13b8a3 100644 --- a/application/default/controllers/HeiheController.php +++ b/application/default/controllers/HeiheController.php @@ -683,7 +683,7 @@ class HeiheController extends DataController //$sth = $this->db->prepare($sql); //$rs = $sth->execute(array($uname,$passwd,$uid,$gid,$homedir)); //$sql="insert into proftpusers (userid,passwd,uid,gid,homedir) values('".$uname."','".$passwd."',109,1002,'".$homedir."')"; - $sql="insert into ".$ftptalbe." (userid,passwd,uid,gid,homedir) values('".$uname."','".$passwd."',1002,1002,'".$homedir."')"; + $sql="insert into ".$ftptable." (userid,passwd,uid,gid,homedir) values('".$uname."','".$passwd."',1002,1002,'".$homedir."')"; $rs=$this->db->query($sql); if($rs) { From 703c42f7781ebfd08c936ee6233ca589beedd324 Mon Sep 17 00:00:00 2001 From: wlx Date: Fri, 24 May 2013 09:02:54 +0000 Subject: [PATCH 18/19] change ftp1 to ftp2 --- .../default/controllers/AuthorController.php | 19 +++++++++---------- .../views/scripts/author/newdata.phtml | 2 +- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/application/default/controllers/AuthorController.php b/application/default/controllers/AuthorController.php index e8240980..0b9d6f0e 100644 --- a/application/default/controllers/AuthorController.php +++ b/application/default/controllers/AuthorController.php @@ -2384,7 +2384,7 @@ class AuthorController extends Zend_Controller_Action // 2. 保存变化记录 save changelog & userid for the latest version $sql = "UPDATE mdversion SET changelog=?,userid=? WHERE id in (select id from mdversion where uuid=? order by ts_created desc limit 1)"; $this->db->query($sql,array($changelog,$u_id,$row['uuid'])); - file_get_contents("http://ftp1.westgis.ac.cn/proftp_upload.php?uuid=".$row['uuid']."&filelist=1"); + file_get_contents("http://ftp2.westgis.ac.cn/proftp_upload.php?uuid=".$row['uuid']."&filelist=1"); // 3. 保存数据评审状态 //导入元数据 @$iso->saveDB($this->db); @@ -2484,8 +2484,12 @@ class AuthorController extends Zend_Controller_Action //ftp路径 $homedir = "/disk1/WestDC/upload/".$uuid."/"; + //ftp用户表 + $ftptable=' pureftp ';//ftp2.westgis.ac.cn + $uid = 1002; + $gid = 1002; - $sql = "SELECT * FROM proftpusers WHERE userid='$uname' ORDER BY pkid DESC"; + $sql = "SELECT * FROM $ftptable WHERE userid='$uname' ORDER BY pkid DESC"; $sth = $this->db->prepare($sql); $sth->execute(); $row = $sth->fetch(); @@ -2495,7 +2499,7 @@ class AuthorController extends Zend_Controller_Action //$old=umask(0); //@mkdir($homedir,0777); //umask($old); - $page=file_get_contents('http://ftp1.westgis.ac.cn/proftp_upload.php?uuid='.$uuid); + $page=file_get_contents('http://ftp2.westgis.ac.cn/proftp_upload.php?uuid='.$uuid); if (!empty($page)) die($page);//there are errors in visit ftp page @@ -2513,14 +2517,11 @@ class AuthorController extends Zend_Controller_Action return true; }else{ - $uid = 109; - $gid = 1002; - $passwd = $this->genRandomString(16); //$sql = "UPDATE proftpusers SET passwd=?,uid=?,gid=?,homedir=? WHERE userid=?"; //$sth = $this->db->prepare($sql); //$rs = $sth->execute(array($passwd,$uid,$gid,$homedir,$uname)); - $sql="update proftpusers SET passwd='".$passwd."',uid=".$uid.",gid=".$gid.",homedir='".$homedir."' WHERE userid='".$uname."'"; + $sql="update ".$ftptable." SET passwd='".$passwd."',uid=".$uid.",gid=".$gid.",homedir='".$homedir."' WHERE userid='".$uname."'"; $rs=$this->db->query($sql); if($rs) { @@ -2542,14 +2543,12 @@ class AuthorController extends Zend_Controller_Action } else{ - $uid = 109; - $gid = 1002; $passwd = $this->genRandomString(16); //$sql = "INSERT INTO proftpusers (userid,passwd,uid,gid,homedir) VALUES (?,?,?,?,?)"; //$sth = $this->db->prepare($sql); //$rs = $sth->execute(array($uname,$passwd,$uid,$gid,$homedir)); - $sql="insert into proftpusers (userid,passwd,uid,gid,homedir) values('".$uname."','".$passwd."',109,1002,'".$homedir."')"; + $sql="insert into ".$ftptable." (userid,passwd,uid,gid,homedir) values('".$uname."','".$passwd."',".$uid.",".$gid.",'".$homedir."')"; $rs=$this->db->query($sql); if($rs) { diff --git a/application/default/views/scripts/author/newdata.phtml b/application/default/views/scripts/author/newdata.phtml index abe534ac..b9452845 100644 --- a/application/default/views/scripts/author/newdata.phtml +++ b/application/default/views/scripts/author/newdata.phtml @@ -96,7 +96,7 @@ function getFtp(uuid){ { if(data.statu > 0) { - var html = '

临时FTP帐号信息(此帐号仅对应当前数据集！)

ftp://ftp1.westgis.ac.cn/

'+ + var html = '

临时FTP帐号信息(此帐号仅对应当前数据集！)

ftp://ftp2.westgis.ac.cn/

'+ '

用户名：'+data.user+ '

密码：'+data.passwd+'

' +'

或直接点击此链接

'; From c34347d14cf3da9b611a575f31ce17e93d088795 Mon Sep 17 00:00:00 2001 From: Li Jianxuan Date: Fri, 24 May 2013 09:16:40 +0000 Subject: [PATCH 19/19] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E8=AF=84=E5=AE=A1?= =?UTF-8?q?=E6=84=8F=E8=A7=81=E5=8F=8D=E9=A6=88=E4=B8=AD=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E4=BA=86=E5=88=B0westdc=E9=82=AE=E7=AE=B1=E7=9A=84=E6=9A=97?= =?UTF-8?q?=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/controllers/ReviewController.php | 1 + 1 file changed, 1 insertion(+) diff --git a/application/admin/controllers/ReviewController.php b/application/admin/controllers/ReviewController.php index cd642a33..0a58ec17 100644 --- a/application/admin/controllers/ReviewController.php +++ b/application/admin/controllers/ReviewController.php @@ -1557,6 +1557,7 @@ class Admin_ReviewController extends Zend_Controller_Action { $mail->addTo($v); } + $mail->addBcc($this->view->config->service->email); $mail->setSubject($title); if($mail->send())