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

merge heihedata branch from r3613 to r3661.

This commit is contained in:
wlx 2013-06-08 07:38:33 +00:00
parent cfc0649536 710a816368
commit b60a981a91
36 changed files with 2773 additions and 2704 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -209,7 +209,8 @@ class Admin_DataController extends Zend_Controller_Action
{
$add=(int)$this->_getParam('add');
$edit=(int)$this->_getParam('edit');
$delete=(int)$this->_getParam('delete');
$delete=(int)$this->_getParam('delete');
set_time_limit(0);
if ($add) {
$form=new DatasetcdForm();
$form->img->setRequired(true);
@ -2424,7 +2425,7 @@ class Admin_DataController extends Zend_Controller_Action
@$mail->send();
//email to experts
$sql="select u.username,u.email from mdexpertreview e left join users u on e.id=u.id where e.status in (0,1) and e.uuid=?";
$sql="select u.username,u.email,u.id from mdexpertreview e left join users u on e.id=u.id where e.status in (0,1) and e.uuid=?";
$sth = $this->db->prepare($sql);
$sth->execute(array($row['uuid']));
$experts = $sth->fetchAll();
@ -3561,7 +3562,7 @@ class Admin_DataController extends Zend_Controller_Action
$rows = $fund->fetch($uuid);
}else{
$this->view->ct = "ct";
$rows = $fund->fetch($uuid,false);
$rows = $fund->fetch($uuid,false,0,$this->_getParam('q'));
}
include('data/Metadata.php');

8
application/admin/controllers/NewsController.php
View File

@ -190,7 +190,7 @@ class Admin_NewsController extends Zend_Controller_Action
$data['title'] = $this->_request->getParam('ctitle');
$data['code'] = $this->_request->getParam('code');
//$data['fid'] = $this->_request->getParam('fid');
$data['fid'] = $this->_request->getParam('fid');
$data['ptype'] = $this->_request->getParam('ptype');
$data['is_pub'] = $this->_request->getParam('is_pub');
@ -214,6 +214,12 @@ class Admin_NewsController extends Zend_Controller_Action
return true;
}
$LftRgt = $category->Insert($data['fid']);
$data['tid'] = $data['fid'];
$data['lft'] = $LftRgt['left'];
$data['rgt'] = $LftRgt['right'];
unset($data['fid']);
if($this->db->update($News->tbl_categorys,$data,"id=$edit"))
{
$this->view->msg = '提示信息：栏目添加成功！';

12
application/admin/controllers/ReviewController.php
View File

@ -740,8 +740,10 @@ class Admin_ReviewController extends Zend_Controller_Action
if($update>0 || is_array($update))
{
$ids = '';
if(is_array($update))$ids = join(',',$update);
else $ids=$update;
if(is_array($update))
{
$ids = implode(',',$update);
} else $ids=$update;
if($this->changestatus($ids,1))
{
@ -756,7 +758,7 @@ class Admin_ReviewController extends Zend_Controller_Action
$search->update($data);
}
//仅对单条数据发送email信息，并且注册为数据作者
//仅对单条数据发送email信息
if (is_numeric($ids))
{
$sql="select distinct u.email,m.title,m.uuid from mdstatus s left join metadata m on s.uuid=m.uuid
@ -787,11 +789,11 @@ class Admin_ReviewController extends Zend_Controller_Action
$mail->send();
}
}
view::Post($this,array("content"=>'操作成功!'.$id,'url'=>"/admin/review/draft"));
view::Post($this,array("content"=>'操作成功!'.$ids,'url'=>"/admin/review/draft"));
return true;
}
else{
view::Post($this,array("content"=>'操作失败'.$id,'url'=>"/admin/review/accept"));
view::Post($this,array("content"=>'操作失败'.$ids,'url'=>"/admin/review/accept"));
return true;
}

16
application/admin/controllers/SysController.php
View File

@ -387,14 +387,16 @@ class Admin_SysController extends Zend_Controller_Action
} else if ($ac=='water')
{
$sql = "SELECT m.title,m.uuid,ds.host,ds.path,
(select floor(sum(filesize)/1024/1024*100)/100 from datafile where dsid=ds.id) as filesize,
(select count(id) from datafile where dsid=ds.id) as filecount from metadata m
floor(sum(datafile.filesize)/1024/1024*100)/100 as filesize,
count(datafile.id) as filecount from metadata m
LEFT JOIN mdstatus s ON m.uuid=s.uuid
LEFT JOIN dataset ds ON m.uuid=ds.uuid
left join datafile on ds.id=datafile.dsid
left join datasource on datasource.uuid=m.uuid
left join source on datasource.sourceid=source.id
where s.status>4 and m.datatype=1 and ds.host='ftp1.westgis.ac.cn' and source.code='water'
ORDER BY m.id DESC";
group by m.title,m.uuid,ds.host,ds.path
ORDER BY m.title DESC";
$sth = $this->db->prepare($sql);
$sth->execute();
$rows = $sth->fetchAll();
@ -408,13 +410,15 @@ class Admin_SysController extends Zend_Controller_Action
} else if ($ac=='heihe1')
{
$sql = "SELECT m.title,m.uuid,ds.host,ds.path,
(select floor(sum(filesize)/1024/1024*100)/100 from datafile where dsid=ds.id) as filesize,
(select count(id) from datafile where dsid=ds.id) as filecount from metadata m
floor(sum(datafile.filesize)/1024/1024*100)/100 as filesize,
count(datafile.id) as filecount from metadata m
LEFT JOIN mdstatus s ON m.uuid=s.uuid
LEFT JOIN dataset ds ON m.uuid=ds.uuid
left join datasource on datasource.uuid=m.uuid
left join datafile on ds.id=datafile.dsid
left join source on datasource.sourceid=source.id
where s.status in (2,3,4) and ds.host='ftp1.westgis.ac.cn' and source.code='heihe'
where s.status in (2,3,4) and ds.host='ftp1.westgis.ac.cn' and source.code='heihe'
group by m.title,m.uuid,ds.host,ds.path
ORDER BY m.title DESC";
$sth = $this->db->prepare($sql);
$sth->execute();

169
application/admin/views/scripts/news/category-add.phtml
View File

@ -2,99 +2,98 @@
$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->breadcrumb('<a href="/">首页</a>');
$this->breadcrumb('<a href="/admin">后台首页</a>');
$this->breadcrumb('<a href="/admin/news">新闻中心</a>');
$this->breadcrumb('栏目添加');
?>
<div id="leftPanel">
<?= $this->partial('news/left.phtml'); ?>
</div>
<div id="rightPanel">
<?php if (!empty($this->error)) :?>
<div id="message">
<?php echo $this->error;?>
</div>
<?php endif; ?>
<?php if(empty($this->msg)) {?>
<form id="sampleform" method="post" action="#">
<fieldset>
<legend>栏目添加</legend>
<p>
<label class="required" for="ctitle">栏目标题</label><br/>
<input type="text" id="ctitle" class="half" value="<?php if(!empty($this->info['title'])) echo $this->info['title'];?>" name="ctitle"/>
</p>
<div class="row">
<div class="span3">
<?= $this->partial('news/left.phtml'); ?>
</div>
<div class="span9">
<?php if (!empty($this->error)) :?>
<div id="message">
<?php echo $this->error;?>
</div>
<?php endif; ?>
<?php if(empty($this->msg)) {?>
<form id="sampleform" method="post" action="#">
<p>
<label class="required" for="ptype">栏目类型</label><br/>
<select name="ptype">
<?php if(!empty($this->ptype)) :?>
<?php foreach($this->ptype as $k=>$v) : ?>
<?php if(empty($this->info['ptype'])) {?>
<option value="<?= $v ?>"><?= $k ?></option>
<?php }else{
if($this->info['ptype'] == $v)
{ ?>
<option value="<?= $v ?>" selected="selected"><?= $k ?></option>
<?php }else{?>
<option value="<?= $v ?>"><?= $k ?></option>
<?php }
}?>
<?php endforeach;?>
<?php endif; ?>
</select>
</p>
<fieldset>
<legend>栏目添加</legend>
<p>
<label>父级栏目</label><br />
<select name="fid">
<option value="0">无</option>
<?php if(!empty($this->categories)) :?>
<?php foreach($this->categories as $v) : ?>
<?php if(empty($this->info['fid'])) {?>
<option value="<?= $v['id'];?>">
<?php if(!empty($v[$this->deepField])) {echo str_repeat('-',$v[$this->deepField]);} ?>
<?=$v['title'];?>
</option>
<?php }else{
if($this->info['fid'] == $v['id'])
{ ?>
<option value="<?= $v['id'];?>" selected="selected">
<?php if(!empty($v[$this->deepField])) {echo str_repeat('-',$v[$this->deepField]);} ?>
<?= $v['title'];?>
<p>
<label class="required" for="ctitle">栏目标题</label><br/>
<input type="text" id="ctitle" class="half" value="<?php if(!empty($this->info['title'])) echo $this->info['title'];?>" name="ctitle"/>
</p>
<p>
<label class="required" for="ptype">栏目类型</label><br/>
<select name="ptype">
<?php if(!empty($this->ptype)) :?>
<?php foreach($this->ptype as $k=>$v) : ?>
<?php if(empty($this->info['ptype'])) {?>
<option value="<?= $v ?>"><?= $k ?></option>
<?php }else{
if($this->info['ptype'] == $v)
{ ?>
<option value="<?= $v ?>" selected="selected"><?= $k ?></option>
<?php }else{?>
<option value="<?= $v ?>"><?= $k ?></option>
<?php }
}?>
<?php endforeach;?>
<?php endif; ?>
</select>
</p>
<p>
<label>父级栏目</label><br />
<select name="fid">
<option value="0">无</option>
<?php if(!empty($this->categories)) :?>
<?php foreach($this->categories as $v) : ?>
<?php if(empty($this->info['fid'])) {?>
<option value="<?= $v['id'];?>">
<?php if(!empty($v[$this->deepField])) {echo str_repeat('-',$v[$this->deepField]);} ?>
<?=$v['title'];?>
</option>
<?php }else{?>
<option value="<?= $v['id'];?>"><?= $v['title'];?></option>
<?php }
}?>
<?php endforeach;?>
<?php endif; ?>
</select>
</p>
<?php }else{
if($this->info['fid'] == $v['id'])
{ ?>
<option value="<?= $v['id'];?>" selected="selected">
<?php if(!empty($v[$this->deepField])) {echo str_repeat('-',$v[$this->deepField]);} ?>
<?= $v['title'];?>
</option>
<?php }else{?>
<option value="<?= $v['id'];?>"><?= $v['title'];?></option>
<?php }
}?>
<?php endforeach;?>
<?php endif; ?>
</select>
</p>
<p>
<label class="required" for="code">栏目URL</label><br/>
<input type="text" id="code" class="half" value="<?php if(!empty($this->info['code'])) echo $this->info['code'];?>" name="code"/>(仅小写英文字母与数字)
<small>如填写： technology 则前台访问地址为： http://westdc.westgis.ac.cn/news/technology </small>
</p>
<input type="hidden" name="submit" value="1" />
<p class="box"><input type="submit" class="btn btn-green big" value="提交"/> or <input type="reset" class="btn" value="重置"/></p>
<p>
<label class="required" for="code">栏目URL</label><br/>
<input type="text" id="code" class="half" value="<?php if(!empty($this->info['code'])) echo $this->info['code'];?>" name="code"/>(仅小写英文字母与数字)
<small>如填写： technology 则前台访问地址为： http://westdc.westgis.ac.cn/news/technology </small>
</p>
</fieldset>
<input type="hidden" name="submit" value="1" />
<p class="box"><input type="submit" class="btn btn-green big" value="提交"/> or <input type="reset" class="btn" value="重置"/></p>
</fieldset>
</form>
<?php }else{ ?>
<div class="alert alert-success">
<a data-dismiss="alert" class="close">×</a>
<?php echo $this->msg ?>
</div>
<script language="javascript">setTimeout("self.location='<?php echo $this->jump_url ?>'",3000);</script>
<?php } ?>
</form>
<?php }else{ ?>
<div class="alert alert-success">
<a data-dismiss="alert" class="close">×</a>
<?php echo $this->msg ?>
</div>
<script language="javascript">setTimeout("self.location='<?php echo $this->jump_url ?>'",3000);</script>
<?php } ?>
</div>
</div>

161
application/admin/views/scripts/news/category-edit.phtml
View File

@ -2,8 +2,6 @@
$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');
@ -12,69 +10,98 @@
$this->breadcrumb('<a href="/admin/news">新闻中心</a>');
$this->breadcrumb('栏目管理');
?>
<div id="leftPanel">
<?= $this->partial('news/left.phtml'); ?>
</div>
<div id="rightPanel">
<?php if ($this->msg or $this->messages) :?>
<div id="message">
<?php if ($this->msg) : ?>
<p><?php echo $this->msg; ?></p>
<?php endif; if ($this->messages): foreach($this->messages as $msg): ?>
<p><?php echo $msg; ?></p>
<?php endforeach;endif; ?>
</div>
<?php endif; ?>
<form id="sampleform" method="post" action="#">
<fieldset>
<legend>栏目添加</legend>
<p>
<label class="required" for="ctitle">栏目标题</label><br/>
<input type="text" id="ctitle" class="half" value="<?php if(!empty($this->info['title'])) echo $this->info['title'];?>" name="ctitle"/>
</p>
<p>
<label class="required" for="ptype">栏目类型</label><br/>
<select name="ptype">
<?php if(!empty($this->ptype)) :?>
<?php foreach($this->ptype as $k=>$v) : ?>
<?php if(empty($this->info['ptype'])) {?>
<option value="<?= $v ?>"><?= $k ?></option>
<?php }else{
if($this->info['ptype'] == $v)
{ ?>
<option value="<?= $v ?>" selected="selected"><?= $k ?></option>
<?php }else{?>
<option value="<?= $v ?>"><?= $k ?></option>
<?php }
}?>
<?php endforeach;?>
<?php endif; ?>
</select>
</p>
<p>
<label class="required" for="code">栏目URL</label><br/>
<input type="text" id="code" class="half" value="<?php if(!empty($this->info['code'])) echo $this->info['code'];?>" name="code"/>(仅小写英文字母与数字)
<small>如填写： technology 则前台访问地址为： http://westdc.westgis.ac.cn/news/technology </small>
</p>
<p>
<label class="required" for="display">是否显示:</label><br/>
<select name="is_pub" id="display">
<option value="true" <?php if(empty($this->info['is_pub']) || $this->info['is_pub']==true)echo 'selected="selected"'; ?>>显示</option>
<option value="false" <?php if(!empty($this->info['is_pub'])) if($this->info['is_pub'] == false )echo 'selected="selected"'; ?>>隐藏</option>
</select>
</p>
<input type="hidden" name="submit" value="1" />
<input type="hidden" name="edit" value="<?= $this->info['id']?>"? />
<p class="box"><input type="submit" class="btn btn-green big" value="提交"/> or <input type="reset" class="btn" value="重置"/></p>
</fieldset>
</form>
<div class="row">
<div class="span3">
<?= $this->partial('news/left.phtml'); ?>
</div>
<div class="span9">
<?php if ($this->msg or $this->messages) :?>
<div id="message">
<?php if ($this->msg) : ?>
<p><?php echo $this->msg; ?></p>
<?php endif; if ($this->messages): foreach($this->messages as $msg): ?>
<p><?php echo $msg; ?></p>
<?php endforeach;endif; ?>
</div>
<?php endif; ?>
<form id="sampleform" method="post" action="#">
<fieldset>
<legend>栏目添加</legend>
<p>
<label class="required" for="ctitle">栏目标题</label><br/>
<input type="text" id="ctitle" class="half" value="<?php if(!empty($this->info['title'])) echo $this->info['title'];?>" name="ctitle"/>
</p>
<p>
<label class="required" for="ptype">栏目类型</label><br/>
<select name="ptype">
<?php if(!empty($this->ptype)) :?>
<?php foreach($this->ptype as $k=>$v) : ?>
<?php if(empty($this->info['ptype'])) {?>
<option value="<?= $v ?>"><?= $k ?></option>
<?php }else{
if($this->info['ptype'] == $v)
{ ?>
<option value="<?= $v ?>" selected="selected"><?= $k ?></option>
<?php }else{?>
<option value="<?= $v ?>"><?= $k ?></option>
<?php }
}?>
<?php endforeach;?>
<?php endif; ?>
</select>
</p>
<p>
<label class="required" for="code">栏目URL</label><br/>
<input type="text" id="code" class="half" value="<?php if(!empty($this->info['code'])) echo $this->info['code'];?>" name="code"/>(仅小写英文字母与数字)
<small>如填写： technology 则前台访问地址为： http://westdc.westgis.ac.cn/news/technology </small>
</p>
<p>
<label class="required" for="display">是否显示:</label><br/>
<select name="is_pub" id="display">
<option value="true" <?php if(empty($this->info['is_pub']) || $this->info['is_pub']==true)echo 'selected="selected"'; ?>>显示</option>
<option value="false" <?php if(!empty($this->info['is_pub'])) if($this->info['is_pub'] == false )echo 'selected="selected"'; ?>>隐藏</option>
</select>
</p>
<p>
<label>父级栏目</label><br />
<select name="fid">
<option value="0">无</option>
<?php if(!empty($this->categories)) :?>
<?php foreach($this->categories as $v) : ?>
<?php if(empty($this->info['fid'])) {?>
<option value="<?= $v['id'];?>">
<?php if(!empty($v[$this->deepField])) {echo str_repeat('-',$v[$this->deepField]);} ?>
<?=$v['title'];?>
</option>
<?php }else{
if($this->info['fid'] == $v['id'])
{ ?>
<option value="<?= $v['id'];?>" selected="selected">
<?php if(!empty($v[$this->deepField])) {echo str_repeat('-',$v[$this->deepField]);} ?>
<?= $v['title'];?>
</option>
<?php }else{?>
<option value="<?= $v['id'];?>"><?= $v['title'];?></option>
<?php }
}?>
<?php endforeach;?>
<?php endif; ?>
</select>
</p>
<input type="hidden" name="submit" value="1" />
<input type="hidden" name="edit" value="<?= $this->info['id']?>"? />
<p class="box"><input type="submit" class="btn btn-green big" value="提交"/> or <input type="reset" class="btn" value="重置"/></p>
</fieldset>
</form>
</div>
</div>

2
application/admin/views/scripts/news/left.phtml
View File

@ -1,4 +1,4 @@
<ul>
<ul class="nav nav-list">
<li class="title">新闻中心</li>
<li><a href="/admin/news">新闻中心首页</a></li>
<li><a href="/admin/news/catlog">栏目管理</a></li>

16
application/default/controllers/AuthorController.php
View File

@ -3842,12 +3842,26 @@ class AuthorController extends Zend_Controller_Action
if($ac == "add")
{
$this->_helper->viewRenderer('fund-add');
$uuid = $this->_getParam('uuid');
if(!empty($uuid))
{
include('data/Metadata.php');
$md = new Metadata($this->db);
$this->view->md = $md->view($uuid);
}
if(!empty($submit))
{
$data = $fund->_getParams($this->_request);
$data['userid'] = $uid;
if($fund->add($data) == true)
if(empty($uuid))
{
$s = $fund->add($data);
}else{
$s = $fund->add($data,$uuid);
}
if($s == true)
{
$this->view->AlertType = "alert-success";
$this->view->msg = "添加成功！";

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

File diff suppressed because it is too large Load Diff

82
application/default/controllers/HiwaterController.php
View File

@ -29,13 +29,18 @@ class HiwaterController extends DataController
{
$this->view->pageIn = "collapse5";
}
else if(in_array($acName,array("mso","cosmos","tdp","isotope")))
{
$this->view->pageIn = "collapse6";
}
else if(in_array($acName,array("browse","thumb","fund","tag","timeline","timemap",'author','organization')))
{
$this->view->pageIn = "collapse10";
}
else if(in_array($acName,array("other")))
{
$this->view->pageIn = "collapse6";
$this->view->pageIn = "collapse9";
}
$this->view->pageID = "hiwater-".$acName;
}
@ -97,32 +102,32 @@ class HiwaterController extends DataController
function aviationAction()
{
$this->getmd(array('航空遥感','WiDAS','PLMR','Lidar','CASI','热红外高光谱数据'));
$this->getmdlimited(array('WiDAS','PLMR','Lidar','CASI','热红外高光谱数据'),'航空遥感');
$this->_helper->viewRenderer('base');
}
function radiometerAction()
{
$this->getmd(array('','PLMR'));
$this->getmdlimited('PLMR','航空遥感');
$this->_helper->viewRenderer('base');
}
function lidarAction()
{
$this->getmd(array('LIDAR','Lidar'));
$this->getmdlimited('激光雷达','航空遥感');
$this->_helper->viewRenderer('base');
}
function widasAction()
{
$this->getmd(array('WIDAS','WiDAS'));
{
$this->getmdlimited('WIDAS','航空遥感');
$this->_helper->viewRenderer('base');
}
function nearvisAction()
{
$this->getmd(array('','CASI'));
{
$this->getmdlimited('CASI','航空遥感');
$this->_helper->viewRenderer('base');
}
function thermalAction()
{
$this->getmd(array('','热红外高光谱数据'));
{
$this->getmdlimited('热红外高光谱数据','航空遥感');
$this->_helper->viewRenderer('base');
}
@ -236,7 +241,7 @@ class HiwaterController extends DataController
}
function bnulaiAction()
{
$this->getmd(array('','BNULAI'));
$this->getmd(array('','LAI'));
$this->_helper->viewRenderer('base');
}
@ -270,7 +275,31 @@ class HiwaterController extends DataController
{
$this->getmd('试验','theme');
}
function msoAction()
{
$this->getmd(array('稳定同位素观测系统','热扩散液流计（TDP）','宇宙射线土壤水分'));
$this->_helper->viewRenderer('base');
}
function isotopeAction()
{
$this->getmd(array('','稳定同位素观测系统'));
$this->_helper->viewRenderer('base');
}
function tdpAction()
{
$this->getmd(array('','热扩散液流计（TDP）'));
$this->_helper->viewRenderer('base');
}
function cosmosAction()
{
$this->getmd(array('','宇宙射线土壤水分'));
$this->_helper->viewRenderer('base');
}
function listAction()
{
$sql="select uuid,title from normalmetadata where uuid in (select d.uuid from datasource d left join source s on d.sourceid=s.id where s.code='hiwater') order by timebegin,title";
@ -412,6 +441,37 @@ class HiwaterController extends DataController
$this->view->metadata=$this->db->fetchAll($sql,array($this->limit,$offset));
$this->view->page=new Pagination($sum,$page,$this->limit);
$this->view->offset=$offset+1;
}
//获取多项条件并列关系的数据并必须满足limited条件
//$keyword:字符串或字符串数组
//$limited:限制字符串
private function getmdlimited($keyword,$limited)
{
$page=(int)$this->_request->getParam('page');
if (empty($page)) $page=1;
$offset=$this->limit*($page-1);
if (!is_array($keyword))
{
$keyword=array($keyword);
}
$key="(";
foreach($keyword as $k)
{
$key.="'".$k."',";
}
$key=substr($key,0,-1);
$key.=")";
$keyword=$key;
$state=$this->db->query("select count(m.*) from normalmetadata m left join datasource d on m.uuid=d.uuid left join source s on d.sourceid=s.id where s.code='hiwater' and m.id in (select id from keyword where keyword='".$limited."') and m.id in (select id from keyword where keyword in ".$keyword.")");
$row=$state->fetchAll();
$sum=$row[0]['count'];
//@todo: add order with title
$sql="select uuid,title from normalmetadata where uuid in (select d.uuid from datasource d left join source s on d.sourceid=s.id where s.code='hiwater') and id in (select id from keyword where keyword='".$limited."') and id in (select id from keyword where keyword in ".$keyword.") order by timebegin,title limit ? offset ?";
$this->view->metadata=$this->db->fetchAll($sql,array($this->limit,$offset));
$this->view->page=new Pagination($sum,$page,$this->limit);
$this->view->offset=$offset+1;
}
//基于数据作者的浏览（包括认证后的数据作者以及未认证的数据作者）

6
application/default/controllers/SearchController.php
View File

@ -6,7 +6,11 @@ class SearchController extends Zend_Controller_Action
$this->db=Zend_Registry::get('db');
$this->view->config = Zend_Registry::get('config');
$this->messenger=$this->_helper->getHelper('FlashMessenger');
$this->view->messages = $this->messenger->getMessages();
$this->view->messages = $this->messenger->getMessages();
$this->view->nav = array(
array('link'=>'/','title'=>'<i class="icon-home"></i>'),
array('link'=>'/data','title'=>$this->view->config->title->data),
);
}
function indexAction()

183
application/default/views/scripts/author/fund-add.phtml
View File

@ -1,91 +1,94 @@
<?php
$this->headTitle($this->config->title->site);
$this->headTitle($this->config->title->author);
$this->headTitle()->setSeparator(' - ');
$this->breadcrumb('<a href="/">首页</a>');
$this->breadcrumb('<a href="/author">数据作者</a>');
$this->headLink()->appendStylesheet('/css/author.css');
$this->breadcrumb('申请成为元数据作者');
$this->breadcrumb()->setSeparator(' > ');
$this->theme->AppendPlus($this,'colorbox');
$this->theme->AppendPlus($this,'admin_plugin');
?>
<div class="row-fluid">
<div class="span3">
<?= $this->partial('author/navi.phtml'); ?>
</div>
<div class="span9">
<div>
<ul class="nav nav-tabs">
<li><a href="/author/fund/">所有项目</a></li>
<li class="active"><a href="/author/fund/ac/add">添加新项目</a></li>
</ul>
</div>
<div class="">
<?php if(!empty($this->error)) { ?>
<div class="alert alert-block alert-error fade in" id="Alert-error-box">
<a class="close" data-dismiss="alert" href="#">×</a>
<?php if(!is_array($this->error)) { ?><h4 class="alert-heading"><?= $this->error ?></h4><?php } else { ?>
<ul>
<?php foreach($this->error as $v) { ?>
<li><?= $v ?></li>
<?php } ?>
</ul>
<?php } ?>
</div>
<?php } ?>
<?php if(!empty($this->msg)) { ?>
<div class="alert <?= $this->AlertType;?>">
<a data-dismiss="alert" class="close">×</a>
<?php echo $this->msg ?>
</div>
<?php if(!empty($this->jump_url)) { ?>
<script language="javascript">setTimeout("self.location='<?php echo $this->jump_url ?>'",3000);</script>
<?php } ?>
<?php } else{ ?>
<form class="form-horizontal" method="post">
<div class="control-group">
<label class="control-label" for="title">项目名称</label>
<div class="controls">
<input type="text" id="title" class="span12" name="title" value="<?= isset($this->data['title']) ? $this->data['title']:"" ?>" />
</div>
</div>
<div class="control-group">
<label class="control-label" for="fund_id">编号</label>
<div class="controls">
<input type="text" id="fund_id" name="fund_id" value="<?= isset($this->data['fund_id']) ? $this->data['fund_id']:"" ?>" />
</div>
</div>
<div class="control-group">
<label class="control-label" for="fund_type">类型</label>
<div class="controls">
<input type="text" id="fund_type" name="fund_type" value="<?= isset($this->data['fund_type']) ? $this->data['fund_type']:"" ?>" />
</div>
</div>
<div class="control-group">
<label class="control-label" for="title_en">英文名称</label>
<div class="controls">
<input type="text" id="title_en" name="title_en" value="<?= isset($this->data['title_en']) ? $this->data['title_en']:"" ?>" />
</div>
</div>
<div class="control-group">
<label class="control-label" for="fund_type_en">英文类型</label>
<div class="controls">
<input type="text" id="fund_type_en" name="fund_type_en" value="<?= isset($this->data['fund_type_en']) ? $this->data['fund_type_en']:"" ?>" />
</div>
</div>
<div class="control-group">
<div class="controls">
<input type="hidden" name="submit" value="1" />
<?php if(!empty($this->id)) { ?>
<input type="hidden" name="id" value=" <?=$this->id?> " />
<?php } ?>
<button type="submit" class="btn btn-primary">提交</button>
</div>
</div>
</form>
<?php } ?>
</div>
</div>
</div>
<?php
$this->headTitle($this->config->title->site);
$this->headTitle($this->config->title->author);
$this->headTitle()->setSeparator(' - ');
$this->breadcrumb('<a href="/">首页</a>');
$this->breadcrumb('<a href="/author">数据作者</a>');
$this->headLink()->appendStylesheet('/css/author.css');
$this->breadcrumb('申请成为元数据作者');
$this->breadcrumb()->setSeparator(' > ');
$this->theme->AppendPlus($this,'colorbox');
$this->theme->AppendPlus($this,'admin_plugin');
?>
<div class="row-fluid">
<div class="span3">
<?= $this->partial('author/navi.phtml'); ?>
</div>
<div class="span9">
<div>
<ul class="nav nav-tabs">
<li><a href="/author/fund/">所有项目</a></li>
<li class="active"><a href="/author/fund/ac/add">添加新项目</a></li>
</ul>
</div>
<div class="">
<?php if(!empty($this->md['title'])) { ?>
<h3>为《<?= $this->md['title'] ?>》添加项目</h3>
<?php } ?>
<?php if(!empty($this->error)) { ?>
<div class="alert alert-block alert-error fade in" id="Alert-error-box">
<a class="close" data-dismiss="alert" href="#">×</a>
<?php if(!is_array($this->error)) { ?><h4 class="alert-heading"><?= $this->error ?></h4><?php } else { ?>
<ul>
<?php foreach($this->error as $v) { ?>
<li><?= $v ?></li>
<?php } ?>
</ul>
<?php } ?>
</div>
<?php } ?>
<?php if(!empty($this->msg)) { ?>
<div class="alert <?= $this->AlertType;?>">
<a data-dismiss="alert" class="close">×</a>
<?php echo $this->msg ?>
</div>
<?php if(!empty($this->jump_url)) { ?>
<script language="javascript">setTimeout("self.location='<?php echo $this->jump_url ?>'",3000);</script>
<?php } ?>
<?php } else{ ?>
<form class="form-horizontal" method="post">
<div class="control-group">
<label class="control-label" for="title">项目名称</label>
<div class="controls">
<input type="text" id="title" class="span12" name="title" value="<?= isset($this->data['title']) ? $this->data['title']:"" ?>" />
</div>
</div>
<div class="control-group">
<label class="control-label" for="fund_id">编号</label>
<div class="controls">
<input type="text" id="fund_id" name="fund_id" value="<?= isset($this->data['fund_id']) ? $this->data['fund_id']:"" ?>" />
</div>
</div>
<div class="control-group">
<label class="control-label" for="fund_type">类型</label>
<div class="controls">
<input type="text" id="fund_type" name="fund_type" value="<?= isset($this->data['fund_type']) ? $this->data['fund_type']:"" ?>" />
</div>
</div>
<div class="control-group">
<label class="control-label" for="title_en">英文名称</label>
<div class="controls">
<input type="text" id="title_en" name="title_en" value="<?= isset($this->data['title_en']) ? $this->data['title_en']:"" ?>" />
</div>
</div>
<div class="control-group">
<label class="control-label" for="fund_type_en">英文类型</label>
<div class="controls">
<input type="text" id="fund_type_en" name="fund_type_en" value="<?= isset($this->data['fund_type_en']) ? $this->data['fund_type_en']:"" ?>" />
</div>
</div>
<div class="control-group">
<div class="controls">
<input type="hidden" name="submit" value="1" />
<?php if(!empty($this->id)) { ?>
<input type="hidden" name="id" value=" <?=$this->id?> " />
<?php } ?>
<button type="submit" class="btn btn-primary">提交</button>
</div>
</div>
</form>
<?php } ?>
</div>
</div>
</div>
<!-- //页面内容 -->

2
application/default/views/scripts/author/fund.phtml
View File

@ -22,7 +22,7 @@ table thead tr th {background:#EBF2F6;}
<ul class="nav nav-tabs">
<li><a href="/author/fund/ac/data">数据相关</a></li>
<li <?php if(empty($this->md)) { ?>class="active"<?php } ?>><a href="/author/fund/">所有项目</a></li>
<li><a href="/author/fund/ac/add">添加新项目</a></li>
<li><a href="/author/fund/ac/add<?= empty($this->md['uuid']) ? "":'/uuid/'.$this->md['uuid']?>">添加新项目</a></li>
<?php if(!empty($this->md)) { ?>
<li class="active"><a href="/author/fund/">按数据查看</a></li>
<?php } ?>

1
application/default/views/scripts/author/version-diff.phtml
View File

@ -2,7 +2,6 @@
$this->headTitle($this->config->title->site);
$this->headTitle($this->config->title->author);
$this->headTitle()->setSeparator(' - ');
$this->headScript()->appendFile('/js/jquery-1.7.min.js');
$this->headScript()->appendFile('/js/diffview.js');
$this->headScript()->appendFile('/js/difflib.js');
$this->headLink()->appendStylesheet('/css/author.css');

2
application/default/views/scripts/author/version.phtml
View File

@ -92,7 +92,7 @@ function commit(id){
<form>
<p>
<label>版本改动:</label><br />
<textarea class="span6" style="resize:none;height:200px;" id="changelog"></textarea>
<textarea class="input-block-level" style="resize:none;height:200px;" id="changelog"></textarea>
<br /><small>请输入此版本与之前版本的差别</small>
</p>
<input type="button" onclick="" id="commit_submit" class="btn btn-green big" value="提交"/>

5
application/default/views/scripts/data/advancesearch.phtml
View File

@ -110,8 +110,9 @@ function initialize() {
//console.dir(latlng);
});
google.maps.event.addListener(dz, 'dragend', function (latlng) {
MapValueChange(latlng.fa.d,latlng.Z.d,latlng.fa.b,latlng.Z.b);
setRectangle(latlng.fa.d,latlng.fa.b,latlng.Z.b,latlng.Z.d);
console.log(latlng);
MapValueChange(latlng.fa.d,latlng.$.d,latlng.fa.b,latlng.$.b);
setRectangle(latlng.fa.d,latlng.fa.b,latlng.$.b,latlng.$.d);
//console.dir(latlng);
});

208
application/default/views/scripts/data/order.phtml
View File

@ -6,156 +6,102 @@
$this->breadcrumb('<a href="/">首页</a>');
$this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
$this->breadcrumb('离线申请');
$this->breadcrumb()->setSeparator(' > ');
$this->breadcrumb()->setSeparator(' > ');
$this->nav[] = array('link'=>"/data/order",'title'=>'数据蓝');
?>
<div class="row">
<?= $this->render('breadcrumbs.phtml') ?>
<div class="row">
<div class="span3">
<div class="well sidebar-nav">
<?= $this->partial('account/left.phtml'); ?>
</div><!--/.well -->
</div><!--/span-->
<div class="span9">
<h3>数据篮</h3>
<h3>数据篮</h3>
<hr />
<?php if(!empty($this->msg)) { ?>
<?php if(!empty($this->jump_url)) {?>
<div class="alert <?= $this->AlertType;?>">
<a data-dismiss="alert" class="close">×</a>
<?php echo $this->msg ?>
</div>
<?php if(!empty($this->jump_url)) { ?>
<br /><a href="<?= $this->jump_url ?>">如果页面没有自动跳转请点击这里</a>
<script language="javascript">setTimeout("self.location='<?php echo $this->jump_url ?>'",3000);</script>
<?php } ?>
<?php } ?>
<?php }else{?>
<?php if(!empty($this->error)) { ?>
<div class="alert alert-block alert-error fade in" id="Alert-error-box">
<a class="close" data-dismiss="alert" href="#">×</a>
<?php if(!is_array($this->error)) { ?><h4 class="alert-heading"><?= $this->error ?></h4><?php } else { ?>
<ul>
<?php foreach($this->error as $v) { ?>
<li><?= $v ?></li>
<?php } ?>
</ul>
<?php } ?>
</div>
<?php } ?>
<!-- content -->
<?php if ($this->dataorder0) : ?>
<div id="row">
<h4>正在下载中的在线数据（<a href="/data/order/finish/all">完成所有</a> <a href="/data/order/cancel/all">取消所有</a>）</h4>
<table class="table table-bordered table-striped">
<thead>
<th>开始时间</th>
<th>数据名称</th>
<th>操作</th>
</thead>
<tbody>
<?php foreach($this->dataorder0 as $order) : ?>
<tr>
<td><?php echo date('Y-m-d H:i:s',strtotime($order['ts_created'])); ?></td>
<td><a href="<?php echo $order['uuid']; ?>"><?php echo $order['title']; ?></a></td>
<td></td>
</tr>
<?php endforeach; ?>
</tbody>
</table>
</div>
<?php endif; ?>
<?php if ($this->dataorder1) : ?>
<hr />
<div id="row">
<h4>准备提交的离线申请（<a href="/data/order/apply/all">提交所有离线申请</a>）</h4>
<table class="table table-bordered table-striped">
<thead>
<th>申请时间</th>
<th>数据类型</th>
<th>数据名称</th>
<th>操作</th>
</thead>
<tbody>
<?php foreach($this->dataorder1 as $order) : ?>
<tr>
<td><?php echo date('Y-m-d H:i:s',strtotime($order['ts_created'])); ?></td>
<td><?php print $order['datatype']?'离线数据':'在线数据'; ?></td>
<td><a href="<?php echo $order['uuid']; ?>"><?php echo $order['title']; ?></a></td>
<td><a href="/data/order/apply/<?php echo $order['id']; ?>" class="btn btn-primary btn-small">离线申请</a>
<a href="/data/order/cancel/<?php echo $order['id']; ?>" class="btn btn-small">取消下载</a></td>
</tr>
<?php endforeach; ?>
</tbody>
</table>
</div>
<?php endif; ?>
<?php if ($this->dataorder2) : ?>
<hr />
<div id="row">
<h4>已提交的离线申请（<a href="/data/order/pdf/1">生成PDF离线数据申请表</a> ）</h4>
<table class="table table-bordered table-striped">
<thead>
<th>申请时间</th>
<th>数据名称</th>
<th>申请状态</th>
</thead>
<tbody>
<?php foreach($this->dataorder2 as $order) : ?>
<tr>
<td><?php echo date('Y-m-d H:i:s',strtotime($order['ts_created'])); ?></td>
<td><a href="<?php echo $order['uuid']; ?>"><?php echo $order['title']; ?></a></td>
<td>
<?php switch($order['status']) {
<?php
if(!empty($this->msg))
{
echo $this->msg;
}
?>
<ul class="nav nav-tabs">
<li id="Nav-order-offline1"><a href="/data/order/ac/offline1">未提交的数据</a></li>
<li id="Nav-order-offline2"><a href="/data/order/ac/offline2">正在提交的数据</a></li>
<li id="Nav-order-offline3"><a href="/data/order/ac/offline3">等待通过的申请</a></li>
<li id="Nav-order-offline4"><a href="/data/order/ac/offline4">已通过的申请</a></li>
<li id="Nav-order-online"><a href="/data/order/ac/online">在线数据</a></li>
</ul>
<!-- content -->
<?php if (!empty($this->paginator)) : ?>
<div class="pagenavi"><?= $this->paginator; ?></div>
<table class="table table-bordered table-striped">
<thead>
<th>时间</th>
<th>标题</th>
<th>
<?php if ($this->tabID=='order-offline1') {
echo '<a class="btn btn-primary" href="/data/order/apply/all">提交所有数据</a>（一次最多5条）';
} elseif ($this->tabID=='order-offline2') {
echo '<a class="btn btn-primary" href="/data/order/pdf/1">提交离线申请</a>';
} elseif ($this->tabID=='order-offline3') {
echo '申请状态';
} elseif ($this->tabID=='order-offline4') {
echo '通过时间';
}
?>
</th>
</thead>
<tbody>
<?php foreach($this->paginator as $order) : ?>
<tr>
<td><?php echo date('Y-m-d H:i:s',strtotime($order['ts_created'])); ?></td>
<td><a href="<?php echo $order['uuid']; ?>"><?php echo $order['title']; ?></a></td>
<td>
<?php
if ($this->tabID=='order-offline1') {
echo '<a href="/data/order/apply/'.$order['id'].'" class="btn btn-primary">提交</a>
<a href="/data/order/cancel/'.$order['id'].'" class="btn">取消</a>';
} elseif ($this->tabID=='order-offline2') {
switch($order['status']) {
case 2:
echo "请生成PDF申请表";
echo ' <a href="/data/order/cancel/'.$order['id'].'">取消</a>';
echo ' <a class="btn" href="/data/order/cancel/'.$order['id'].'">取消</a>';
break;
case 3:
echo "请打印并邮寄申请表";
echo "请打印签字然后扫描或拍照申请表并email或邮寄";
break;
default:
break;
}
} elseif ($this->tabID=='order-offline3') {
switch($order['status']) {
case 3:
echo "请打印签字然后扫描或拍照申请表并email或邮寄";
break;
case 4:
echo "已收到申请，请等待审批";
echo "已收到申请，请等待审批。日期：";echo date('Y-m-d',strtotime($order['ts_received']));
break;
case 5:
echo "已通过申请，请查收邮件";
break;
default:
break;
}
?>
</td>
</tr>
<?php endforeach; ?>
</tbody>
</table>
</div>
<?php endif; ?>
<?php if ($this->dataorder3) : ?>
<hr />
<div id="row">
<h4>已通过的离线申请</h4>
<table class="table table-bordered table-striped">
<thead>
<th>申请时间</th>
<th>数据名称</th>
<th>通过时间</th>
</thead>
<tbody>
<?php foreach($this->dataorder3 as $order) : ?>
<tr>
<td><?php echo date('Y-m-d H:i:s',strtotime($order['ts_created'])); ?></td>
<td><a href="<?php echo $order['uuid']; ?>"><?php echo $order['title']; ?></a></td>
<td><?php echo date('Y-m-d H:i:s',strtotime($order['ts_approved'])); ?></td>
</tr>
<?php endforeach; ?>
</tbody>
</table>
</div>
<?php endif; ?>
}
} elseif ($this->tabID=='order-offline4') {
echo date('Y-m-d',strtotime($order['ts_approved']));
}
?>
</td>
</tr>
<?php endforeach; ?>
</tbody>
</table>
<?php endif; ?>
<!-- /content -->
<?php }?>
</div><!--/span-->
</div><!--/row-->
</div><!--/row-->
<script>$('#Nav-<?= $this->tabID?>').addClass("active");</script>

20
application/default/views/scripts/data/pdf.phtml
View File

@ -16,20 +16,20 @@
</div><!--/.well -->
</div><!--/span-->
<div class="span9">
<h3>数据申请</h3>
<hr />
<p> 为促进中国西部资源与生态环境科学研究,更好的为西部大开发服务,充分利用数据中心多年来的数据积累及国家自然科学基金委员会“中国西部环境与生态科学研究计划”、数字流域等的数据产出,
根据我国科学数据共享和基金项目数据管理的有关规定, 中科院寒区旱区环境与工程研究所(简称甲方)同意接收__________（以下简称乙方）的数据申请,并签订数据使用协议（<strong>其中用途部分，请填写您的详细使用目的；项目类型请从列表中选择，若无对应的项目支持，请选择其他项目工程；如项目无编号信息，则填写“无”；硕博论文请在用途中注明；详细准确的信息能使您更快通过申请。</strong>）：
</p>
<hr />
<h4>数据清单</h4>
<h3>离线申请提交</h3>
<h4>数据清单</h4>
<blockquote>
<ul class="unstyled">
<?php foreach ($this->data2 as $i=>$md) : ?>
<li><?php echo ($i+1).". ".$md['title']; ?></li>
<?php endforeach; ?>
</ul>
<hr />
<h4>用户信息(请务必填写真实信息以便邮寄)</h4>
</ul></blockquote>
<hr />
<h4>申请表填写说明</h4>
<blockquote>
<p class="text-info">其中用途部分，请填写您的详细使用目的；项目类型请从列表中选择，若无对应的项目支持，请选择其他项目工程；如项目无编号信息，则填写“无”；硕博论文请在用途中注明。</p>
<p class="text-success">详细准确的信息能使您更快通过申请。(数据提供者会根据您提供的信息来进行决策判断)</p></blockquote>
<h4>申请表(请务必填写真实信息以便审核通过)</h4>
<?php if ($this->messages): foreach($this->messages as $msg): ?>
<div class="alert"><?php echo $msg; ?></div>
<?php endforeach;endif; ?>

62
application/default/views/scripts/data/request.phtml
View File

@ -1,58 +1,10 @@
<?php
$this->headTitle($this->config->title->site);
$this->headTitle($this->config->title->data);
$this->headTitle('如何申请数据');
$this->headTitle($this->config->title->site);
$this->headTitle($this->config->title->data);
$this->headTitle('如何申请数据');
$this->headTitle()->setSeparator(' - ');
//$this->headLink()->appendStylesheet('/css/terms.css');
$this->breadcrumb('<a href="/">首页</a>');
$this->breadcrumb("<a href='/data'>".$this->config->title->data."</a>");
$this->breadcrumb('<a href="/data/request">如何申请数据</a>');
$this->breadcrumb()->setSeparator(' > ');
$this->nav[] = array('link'=>"/data/request",'title'=>'如何申请数据');
?>
<div class="LeftMargin">
<h1>如何申请数据?</h1>
<p>“西部数据中心”数据申请支持两种方式：在线方式和离线方式。</p>
<br />
<h2>在线方式： </h2>
<p>
在线数据获取请访问“西部数据中心”共享门户网站(<a href="Http://westdc.westgis.ac.cn">Http://westdc.westgis.ac.cn</a>)，免费注册后，登陆，按类别浏览元数据或者根据关键词进行元数据搜索。如果元数据支持在线下载，在详细元数据里可以找到一个或多个下载链接，点击链接，按提示进行HTTP或FTP下载。使用客户端下载时，建议不超过5线程。<br />
</p>
<h2>离线方式：</h2>
受国家数据政策限制或数据提供者的要求，一些数据提供在线下载。“西部数据中心”有专人负责数据服务，会在尽短时间内回复离线数据请求。“西部数据中心”按照“完全与开放”数据共享原则，以不高于复印、邮寄或材料费提供数据。用户在收到数据后，请按通知返回上述费用。<br />
<p>1、找到需要的数据<br />
2、点击离线申请<br />
3、重复步骤1、2，选择所需的数据，最多可以同时申请5个数据。<br />
4、进入"数据篮",提交离线申请。<br />
5、根据系统反馈的邮件进行进一步的操作：打印申请表，签字盖章后邮寄给西部数据中心。<br />
6、等待西部数据中心答复</p>
<p>
地址：甘肃兰州东岗西路320号&nbsp;中国科学院寒区旱区环境与工程研究所&nbsp;遥感与地理信息科学研究室<br />
收件：“西部数据中心”服务组 （收）<br />
邮编： 730000<br />
电话： 0931－4967287 （李红星）<br />
<br />
</p>
<div align="center">
<img src="/images/DataRequest.jpg" alt="数据申请流程" width="562" height="410" border="0"
usemap="#Map" hidefocus="true" />
<map name="Map" id="Map">
<area shape="poly" coords="203,50,257,51,257,101,258,121,295,125,297,139,161,141,164,125,198,120"
href="http://westdc.westgis.ac.cn" />
<area shape="poly" coords="192,231,236,232,235,286,253,288,251,304,233,307,233,318,193,317,191,304,177,304,179,288,195,285"
href="Documents/application.pdf" />
<area shape="poly" coords="25,237,75,235,72,294,96,297,99,315,86,318,88,331,10,332,11,318,0,317,0,296,26,294"
href="mailto:westdc@lzb.ac.cn" />
</map>
</div>
<div>
<h2>
联系我们：</h2>
<p>
任何意见和建议请联系我们，<a href="mailto:westdc@lzb.ac.cn">westdc@lzb.ac.cn</a>。<br />
或者<a href="/about/contact">在线提交</a>。<br />
</p>
</div>
</div>
<?= $this->render('breadcrumbs.phtml') ?>
<h2>如何申请数据</h2>
<?= $this->item['body']; ?>

37
application/default/views/scripts/data/submit.phtml
View File

@ -1,33 +1,10 @@
<?php
$this->headTitle($this->config->title->site);
$this->headTitle($this->config->title->data);
$this->headTitle('如何提交数据');
$this->headTitle($this->config->title->site);
$this->headTitle($this->config->title->data);
$this->headTitle('如何发布数据');
$this->headTitle()->setSeparator(' - ');
//$this->headLink()->appendStylesheet('/css/terms.css');
$this->breadcrumb('<a href="/">首页</a>');
$this->breadcrumb("<a href='/data'>".$this->config->title->data."</a>");
$this->breadcrumb('<a href="/data/submit">如何提交数据</a>');
$this->breadcrumb()->setSeparator(' > ');
$this->nav[] = array('link'=>"/data/submit",'title'=>'如何发布数据');
?>
<h2>准备数据</h2>
在提交数据之前，您需要首先整理数据，制作相应的数据文档。西部数据中心对数据格式没有要求，但如果是自定义的数据格式，请务必要在数据文档中说明各字段含义及数据使用方式。在撰写数据文档说明中请明确阐述数据背景、生产过程、质量控制、内容、引用等信息，详细请参考我们附件的样例文档。数据汇总后我们会加以整理，并在提交的数据文档基础上进行必要的整理和扩充。
<h2>提交数据</h2>
提交数据有多种方式，若您有任何不清楚，<a href="/about/contact">请务必联系我们</a>。
<h3>FTP传输方式</h3>
这是我们推荐给您的首选方式，优点是支持大文件传输，速度快。您可以使用FTP客户端工具上传数据到我们的文件服务器。
FTP地址： ftp://ftp.westgis.ac.cn 用户名：upload 密码：upload （注：此链接只用于数据上传，无法进行下载、删除等操作）
请在上传结束后，发送一封电子邮件给<a href="mailto:westdc@lzb.ac.cn">西部数据中心</a>，以便我们尽快地发布您的数据。
<h3>电子邮件传输方式</h3>
若您的数据量（小于5Mb）不大，也可以采用电子邮件方式发送给我们。我们的邮件地址是：<a href="mailto:westdc@lzb.ac.cn">westdc@lzb.ac.cn</a>。
<h3>传统邮寄方式</h3>
您也可以通过传统的邮递方式发送给我们，我们的联系地址是：
地址：甘肃兰州东岗西路320号&nbsp;中国科学院寒区旱区环境与工程研究所&nbsp;遥感与地理信息研究室<br />
收件：“西部数据中心”服务组 （收）<br />
邮编： 730000<br />
电话： 0931－4967287 （李红星）<br />
<h3>发布数据</h3>
我们在接收到您的数据后，将尽快根据您的数据文档制作元数据，发布到西部数据中心网站上。而在发布之前，我们将把其发送给您检查错误。
请您在提交数据的同时确定项目数据的共享程度，包括共享开始时间、共享人员范围和共享方式（在线下载或离线申请两种，在线下载只需要用户在西部数据中心网站注册登陆即可，离线申请需要用户签署数据共享协议），如果没有专门指定，我们将按照数据中心数据共享有关规范进行共享。
<?= $this->render('breadcrumbs.phtml') ?>
<h2>如何发布数据</h2>
<?= $this->item['body']; ?>

2
application/default/views/scripts/data/view.phtml
View File

@ -334,7 +334,7 @@ endforeach;
</a>
<?php else: ?>
<a href="/data/order/uuid/<?php echo $md->uuid; ?>" class="btn btn-primary btn-large btn-block" title="免费！离线申请此数据（在线数据和离线数据都可申请）">
离线申请
放入数据篮
</a>
<?php endif;endif; ?>
</div>

2
application/default/views/scripts/heihe/view.phtml
View File

@ -344,7 +344,7 @@ endforeach;
</a>
<?php else: ?>
<a href="/data/order/uuid/<?php echo $md->uuid; ?>" class="btn btn-primary btn-large btn-block" title="免费！离线申请此数据（在线数据和离线数据都可申请）">
离线申请
放入数据篮
</a>
<?php endif;endif; ?>
</div>

32
application/default/views/scripts/hiwater/navi.phtml
View File

@ -25,7 +25,8 @@
</ul>
</div>
</div>
</div>
</div>
<!--
<div class="accordion-group heihe-accordion-title">
<div class="accordion-heading" id="Nav-hiwater-airborne">
<a href="/hiwater/airborne" title="查看详细" class="pull-right detail-link"><i class="icon-arrow-right"></i></a>
@ -46,7 +47,7 @@
</ul>
</div>
</div>
</div>
</div> -->
<div class="accordion-group heihe-accordion-title">
<div class="accordion-heading" id="Nav-hiwater-hmon">
<a href="/hiwater/hmon" title="查看详细" class="pull-right detail-link"><i class="icon-arrow-right"></i></a>
@ -100,24 +101,27 @@
</div>
</div>
</div>
<!--
<div class="accordion-group heihe-accordion-title">
<div class="accordion-heading" id="Nav-water-cold">
<a class="accordion-toggle" href="/hiwater/satellite">
<div class="accordion-heading" id="Nav-hiwater-mso">
<a href="/hiwater/mso" title="查看详细" class="pull-right detail-link"><i class="icon-arrow-right"></i></a>
<a class="accordion-toggle" data-toggle="collapse" data-parent="#side_accordion" href="#collapse6">
地表蒸散发的多尺度观测试验
</a>
</div>
<div id="collapse6" class="accordion-body collapse">
<ul class="nav nav-list heihe-subnav">
<li id="Nav-water-radiometer"><i class="icon-double-angle-right"></i><a href="/hiwater/radiometer">涡动相关观测</a></li>
<li id="Nav-water-lidar"><i class="icon-double-angle-right"></i><a href="/hiwater/lidar">自动气象站</a></li>
<li id="Nav-water-widas"><i class="icon-double-angle-right"></i><a href="/hiwater/widas">大孔径闪烁仪观测</a></li>
<li id="Nav-water-asd"><i class="icon-double-angle-right"></i><a href="/hiwater/asd">同位素</a></li>
<li id="Nav-water-asd"><i class="icon-double-angle-right"></i><a href="/hiwater/asd">树杆液流</a></li>
</ul>
<div id="collapse6" class="accordion-body collapse">
<div class="accordion-inner">
<ul class="nav nav-list heihe-subnav">
<!--<li id="Nav-hiwater-autometeo"><a href="/hiwater/autometeo"><i class="icon-double-angle-right"></i>自动气象站</a></li>
<li id="Nav-hiwater-ec"><a href="/hiwater/ec"><i class="icon-double-angle-right"></i>涡动相关观测</a></li>
<li id="Nav-hiwater-las"><a href="/hiwater/las"><i class="icon-double-angle-right"></i>大孔径闪烁仪观测</a></li>-->
<li id="Nav-hiwater-isotope"><a href="/hiwater/isotope"><i class="icon-double-angle-right"></i>稳定同位素观测</a></li>
<li id="Nav-hiwater-tdp"><a href="/hiwater/tdp"><i class="icon-double-angle-right"></i>树杆液流</a></li>
<li id="Nav-hiwater-cosmos"><a href="/hiwater/cosmos"><i class="icon-double-angle-right"></i>宇宙射线土壤水分观测COSMOS</a></li>
</ul>
</div>
</div>
</div>
<!--
<div class="accordion-group heihe-accordion-title">
<div class="accordion-heading" id="Nav-water-document">
<a href="/hiwater/document" title="查看详细" class="pull-right detail-link"><i class="icon-arrow-right"></i></a>

2
application/default/views/scripts/hiwater/view.phtml
View File

@ -342,7 +342,7 @@ endforeach;
</a>
<?php else: ?>
<a href="/data/order/uuid/<?php echo $md->uuid; ?>" class="btn btn-primary btn-large btn-block" title="免费！离线申请此数据（在线数据和离线数据都可申请）">
离线申请
放入数据篮
</a>
<?php endif;endif; ?>
</div>

42
application/default/views/scripts/index/index.phtml
View File

@ -13,15 +13,6 @@
</div>
<div class="row">
<div class="span5" id="main-news">
<h4><a href="archives">新闻</a></h4>
<hr />
<ul class="news-list">
<?php foreach($this->list_news as $k=>$v){ ?>
<li><span class="pull-right">[<?= date("Y-m-d",strtotime($v['ts_published']))?>]</span><a href="<?= $v['url'] ?>"><?= $v['title'] ?></a></li>
<?php } ?>
</ul>
</div>
<div class="span7" id="feature-news">
<div id="myCarousel" class="carousel slide">
<ol class="carousel-indicators">
@ -39,7 +30,7 @@
echo '<div class="item'.($k==0?' active':'').'">';
echo '<a href="'.$v['url'].'" title="'.$v['description'].'" ><img src="'.$v['image'].'" class="img-rounded featured-image" /></a>';
echo '<div class="carousel-caption">';
echo '<h4><a href="'.$v['url'].'">'.$v['title'].'</a><span class="pull-right">['.date("Y-m-d",strtotime($v['ts_published'])).']</span></h4>';
echo '<h4><span class="pull-right">['.date("Y-m-d",strtotime($v['ts_published'])).']</span><a href="'.$v['url'].'">'.$v['title'].'</a></h4>';
//echo '<p>'.$v['description'].'</p>';
echo '</div></div>';
}
@ -49,6 +40,14 @@
<a class="right carousel-control" href="#myCarousel" data-slide="next">›</a>
</div>
</div>
<div class="span5" id="main-news">
<h4><a href="/archives/help/platform" class="pull-right"><i class="icon-book"></i>帮助</a><a href="/archives"><i class="icon-calendar"></i>新闻</a></h4>
<ul class="news-list">
<?php foreach($this->list_news as $k=>$v){ ?>
<li><span class="pull-right">[<?= date("Y-m-d",strtotime($v['ts_published']))?>]</span><a href="<?= $v['url'] ?>"><?= $v['title'] ?></a></li>
<?php } ?>
</ul>
</div>
</div>
<hr />
<div class="row">
@ -108,19 +107,19 @@
<div class="span4">
<h4>数据导航</h4>
<ul class="unstyled">
<li class="item">
<li>
<a href="/data/category"><i class="icon-th-large"></i>分类浏览</a>
</li>
<li class="item">
<li>
<a href="/data/tag"><i class="icon-tags"></i>关键词导航</a>
</li>
<li class="item">
<li>
<a href="/data/series"><i class="icon-th-list"></i>数据集序列</a>
</li>
<li class="item">
<li>
<a href="/data/timeline"><i class="icon-calendar"></i>时间轴导航</a>
</li>
<li class="item">
<li>
<a href="/data/timemap"><i class="icon-globe"></i>时空导航</a>
</li>
</ul>
@ -128,14 +127,11 @@
<div class="span4">
<h4>统计</h4>
<ul class="unstyled">
<li class="item"><span class="symbol">•&nbsp;</span>元数据 <strong>
<li><span class="symbol">•&nbsp;</span>元数据 <strong>
<span><?php echo $this->metanum; ?></span></strong> 条</li>
<li class="item"><span class="symbol">•&nbsp;</span>在线数据 <strong><?php echo number_format($this->onlinesize/1000,2,'.',''); ?> GB</strong></li>
<li class="item"><span class="symbol">•&nbsp;</span>总数据 <strong><?php echo number_format(($this->onlinesize+$this->offlinesize)/1000,2,'.',''); ?> GB</strong></li>
<li class="item"><span class="symbol">•&nbsp;</span>总注册用户&nbsp;<strong><span><?php echo $this->usernum; ?></span> </strong>&nbsp;人</li>
<li><span class="symbol">•&nbsp;</span>在线数据 <strong><?php echo number_format($this->onlinesize/1000,2,'.',''); ?> GB</strong></li>
<li><span class="symbol">•&nbsp;</span>总数据 <strong><?php echo number_format(($this->onlinesize+$this->offlinesize)/1000,2,'.',''); ?> GB</strong></li>
<li><span class="symbol">•&nbsp;</span>总注册用户&nbsp;<strong><span><?php echo $this->usernum; ?></span> </strong>&nbsp;人</li>
</ul>
</div>
</div>
<script>
$('.item').css('max-height',$('#main-news').height());
</script>
</div>

7
application/default/views/scripts/search/index.phtml
View File

@ -38,8 +38,9 @@ $search=$this->search;
$this->headTitle('搜索');
$this->headTitle()->setSeparator(' - ');
$this->headLink()->appendStylesheet('/css/search.css');
$this->nav[] = array('link'=>"/search",'title'=>'全文搜索');
?>
<?= $this->render('breadcrumbs.phtml'); ?>
<div class="row">
<div class="span12">
<!-- search form -->
@ -96,7 +97,7 @@ $search=$this->search;
<h4>您是不是要找：</h4>
<ul>
<?php foreach ($this->corrected as $word): ?>
<li><a href="<?php echo $_SERVER['SCRIPT_NAME'] . '?q=' . urlencode($word); ?>"><?php echo $word; ?></a></li>
<li><a href="<?php echo '/search?q=' . urlencode($word); ?>"><?php echo $word; ?></a></li>
<?php endforeach; ?>
</ul>
</div>
@ -107,7 +108,7 @@ $search=$this->search;
<h4>您是不是要找：</h4>
<ul>
<?php foreach ($this->expanded as $word): ?>
<li><a href="<?php echo $_SERVER['SCRIPT_NAME'] . '?q=' . urlencode($word); ?>"><?php echo $word; ?></a></li>
<li><a href="<?php echo '/search?q=' . urlencode($word); ?>"><?php echo $word; ?></a></li>
<?php endforeach; ?>
</ul>
</div>

2
application/default/views/scripts/water/view.phtml
View File

@ -334,7 +334,7 @@ endforeach;
</a>
<?php else: ?>
<a href="/data/order/uuid/<?php echo $md->uuid; ?>" class="btn btn-primary btn-large btn-block" title="免费！离线申请此数据（在线数据和离线数据都可申请）">
离线申请
放入数据篮
</a>
<?php endif;endif; ?>
</div>

2
application/models/ISO19115.php
View File

@ -247,7 +247,7 @@ class ISO19115
}
//处理数据集序列
//M:N relation
if ($this->datasetSeries) foreach($this->datasetSeries as $ds)
if ($this->datasetSeries) foreach($this->datasetSeries as $ds) if (!empty($ds['seriesName']))
{
$sql="select id from series where name=?";
$sth=$db->prepare($sql);

18
application/models/OfflinePdfForm.php
View File

@ -32,13 +32,10 @@ class OfflinePdfForm extends Zend_Form
$project_id=new Zend_Form_Element_Text('project_id');
$project_id->setLabel('项目编号')->setRequired(true);
$project_title=new Zend_Form_Element_Text('project_title');
$project_title->setLabel('项目名称')->setRequired(true);
$project_type=new Zend_Form_Element_Select('project_type');
$project_type->setLabel('项目类型')->setRequired(true);
$project_type->addMultiOption("0", "无");
$project_type->addMultiOption("", "请选择项目类型");
$project_type->addMultiOption("国家973计划项目课题", "国家973计划项目课题");
$project_type->addMultiOption("国家863计划课题", "国家863计划课题");
$project_type->addMultiOption("国家级科技支撑课题", "国家级科技支撑课题");
@ -49,15 +46,18 @@ class OfflinePdfForm extends Zend_Form
$project_type->addMultiOption("省部级项目", "省部级项目");
$project_type->addMultiOption("其他项目工程", "其他项目工程");
$project_title=new Zend_Form_Element_Text('project_title');
$project_title->setLabel('项目名称')->setRequired(true)->setAttrib('class','input-block-level');
$project=new Zend_Form_Element_Textarea('project');
$project->setLabel('用途<br/>(请详细描述使用目的)')->setRequired(true)->setAttrib('rows',2);
$project->setLabel('用途<br/>(请详细描述使用目的)')->setRequired(true)->setAttrib('rows',3)->setAttrib('class','input-block-level');
$id = new Zend_Form_Element_Hidden('id');
$save = new Zend_Form_Element_Submit('save');
$save ->setAttrib('id', 'savebutton')
->setAttrib('class', 'btn btn-primary')
->setLabel('保存并预览PDF');
->setAttrib('class', 'btn')
->setLabel('预览PDF');
$submit = new Zend_Form_Element_Submit('submit');
$submit->setAttrib('id', 'submitbutton')
@ -65,7 +65,7 @@ class OfflinePdfForm extends Zend_Form
->setLabel('提交申请到数据中心');
$elements = array($realname,$email,$phone,$unit,$address,$postcode,$project_id,$project_title,$project_type,$project,$id,$save,$submit);
$elements = array($realname,$email,$phone,$unit,$address,$postcode,$project_id,$project_type,$project_title,$project,$id,$save,$submit);
foreach($elements as $k=>$v)
{

26
application/models/Search.php
View File

@ -92,7 +92,7 @@ class Search
//
// variables
$eu = '';
$__ = array('q', 'm', 'f', 's', 'p', 'ie', 'oe', 'syn', 'xml');
$__ = array('q', 'm', 'f', 's', 'p', 'ie', 'oe', 'syn', 'xml','east','west','south','north','begin','end');
foreach ($__ as $_)
$$_ = isset($_GET[$_]) ? $_GET[$_] : '';
@ -105,8 +105,7 @@ ${'f_' . $f} = ' checked';
${'s_' . $s} = ' selected';
if (!isset($q)) $q='';
// base url
$this->base_url = '/search?q=' . urlencode($q) . '&m=' . $m . '&f=' . $f . '&s=' . $s . $eu;
$this->base_url = '/search?q=' . urlencode($q) . '&m=' . $m . '&f=' . $f . '&s=' . $s .'&begin='.$begin.'&end='.$end.'&east='.$east.'&north='.$north.'&west='.$west.'&south='.$south. $eu;
$total_begin = microtime(true);
// perform the search
@ -137,6 +136,27 @@ try
$this->search->setQuery($q);
}
//spatial search
if (!empty($east) && !empty($west) && !empty($south) && !empty($north))
{
$this->search->addRange('east',null,$east);
$this->search->addRange('west',$west,null);
$this->search->addRange('south',$south,null);
$this->search->addRange('north',null,$north);
}
//date search
if (!empty($begin))
{
$from=strtotime($begin);
$this->search->addRange('timebegin',$from,null);
}
if (!empty($end))
{
$to=strtotime($end);
$this->search->addRange('timeend',null,$to);
}
// set sort
if (($pos = strrpos($s, '_')) !== false)
{

19
application/models/data/Fund.php
View File

@ -130,7 +130,7 @@ class Fund extends Zend_Controller_Plugin_Abstract
{
$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
LEFT JOIN metadata md ON md.uuid=mf.uuid
left join mdauthor a on md.uuid=a.uuid
$wheresql
GROUP BY f.id";
@ -138,7 +138,7 @@ class Fund extends Zend_Controller_Plugin_Abstract
}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
LEFT JOIN metadata md ON md.uuid=mf.uuid
left join mdauthor a on md.uuid=a.uuid
$wheresql
GROUP BY md.title,md.uuid,mf.id
@ -150,11 +150,18 @@ class Fund extends Zend_Controller_Plugin_Abstract
return $rows;
}
function add($data)
function add($data,$uuid = NULL)
{
include_once("helper/dbh.php");
$dbh = new dbh($this->db);
return $dbh->insert($this->tbl_fund,$data);
if(empty($uuid))
{
return $dbh->insert($this->tbl_fund,$data);
}else{
$fid = $dbh->insert($this->tbl_fund,$data,true);
return $this->addToMdfund($uuid,$fid,1);
}
}
function update($data,$id,$uid=0)
@ -253,8 +260,8 @@ class Fund extends Zend_Controller_Plugin_Abstract
}
$data = array(
'uuid'=>$uuid,
'fid'=>$id,
'place'=>$order
'fid'=>(int)$id,
'place'=>(int)$order
);
include_once("helper/dbh.php");
$dbh = new dbh($this->db);

263
application/models/helper/dbh.php
View File

@ -1,132 +1,133 @@
<?php
class dbh
{
private $db; //传入PDO对象.
private $product = 0; //产品环境
function __construct($db)
{
$this->db = $db;
}
function insert($table,$data,$return=false)
{
$fields = array();
$datas = array();
foreach($data as $k=>$v)
{
$fields[] = '"'.$k.'"';
if(is_int($v) || is_float($v) || is_bool($v))
{
$datas[] = $v;
}else{
if(preg_match("/\'/",$v))
{
$v = preg_replace("/\'/","''",$v);
}
$datas[] = "'".$v."'";
}
}
if($return == false){
$fields = join(",",$fields);
$datas = join(",",$datas);
$sql = "INSERT INTO \"".$table."\" ($fields) VALUES ($datas)";
try{
return $this->db->exec($sql);
}catch (Exception $e) {
if($this->product)
{
return false;
}else{
echo 'Caught exception: '. $e->getMessage(). "\n";
}
}
}else{
$sql = "INSERT INTO \"".$table."\" ($fields) VALUES ($datas) RETURNING id";
try{
$sth = $this->db->prepare($sql);
if($sth->execute())
{
$temp = $sth->fetch(PDO::FETCH_ASSOC);
return $temp['id'];
}else{
return false;
}
}catch (Exception $e) {
if($this->product)
{
return false;
}else{
echo 'Caught exception: '. $e->getMessage(). "\n";
}
}
}
}//insert
function update($table,$data,$condition="",$return=false)
{
$ups = array();
foreach($data as $k=>$v)
{
if(is_int($v) || is_float($v) || is_bool($v))
{
$ups[] = '"'.$k.'"='.$v;
}else{
if(preg_match("/\'/",$v))
{
$v = preg_replace("/\'/","''",$v);
}
$ups[] = '"'.$k.'"=\''.$v."'";
}
}
$fields = join(",",$ups);
if(!empty($condition))
{
$wheresql = " WHERE ".$condition;
}else{
$wheresql = "";
}
if($return == false){
try{
$sql = "UPDATE \"".$table."\" SET $fields $wheresql";
if($this->db->exec($sql))
{
return true;
}else{
return false;
}
}catch (Exception $e) {
if($this->product)
{
return false;
}else{
echo 'Caught exception: '. $e->getMessage(). "\n";
}
}
}else{
try{
$sql = "UPDATE \"".$table."\" SET $fields $wheresql";
return $this->db->exec($sql);
}catch (Exception $e) {
if($this->product)
{
return false;
}else{
echo "<pre>";
echo $sql."\r\n";
echo 'Caught exception: '. $e->getMessage(). "\r\n";
echo "</pre>";
}
}
}
}//update
<?php
class dbh
{
private $db; //传入PDO对象.
private $product = 0; //产品环境
function __construct($db)
{
$this->db = $db;
}
function insert($table,$data,$return=false)
{
$fields = array();
$datas = array();
foreach($data as $k=>$v)
{
$fields[] = '"'.$k.'"';
if(is_int($v) || is_float($v) || is_bool($v))
{
$datas[] = $v;
}else{
if(preg_match("/\'/",$v))
{
$v = preg_replace("/\'/","''",$v);
}
$datas[] = "'".$v."'";
}
}
$fields = join(",",$fields);
$datas = join(",",$datas);
if($return == false){
$sql = "INSERT INTO \"".$table."\" ($fields) VALUES ($datas)";
try{
return $this->db->exec($sql);
}catch (Exception $e) {
if($this->product)
{
return false;
}else{
echo 'Caught exception: '. $e->getMessage(). "\n";
}
}
}else{
$sql = "INSERT INTO \"".$table."\" ($fields) VALUES ($datas) RETURNING id";
try{
$sth = $this->db->prepare($sql);
if($sth->execute())
{
$temp = $sth->fetch(PDO::FETCH_ASSOC);
return $temp['id'];
}else{
return false;
}
}catch (Exception $e) {
if($this->product)
{
return false;
}else{
echo 'Caught exception: '. $e->getMessage(). "\n";
}
}
}
}//insert
function update($table,$data,$condition="",$return=false)
{
$ups = array();
foreach($data as $k=>$v)
{
if(is_int($v) || is_float($v) || is_bool($v))
{
$ups[] = '"'.$k.'"='.$v;
}else{
if(preg_match("/\'/",$v))
{
$v = preg_replace("/\'/","''",$v);
}
$ups[] = '"'.$k.'"=\''.$v."'";
}
}
$fields = join(",",$ups);
if(!empty($condition))
{
$wheresql = " WHERE ".$condition;
}else{
$wheresql = "";
}
if($return == false){
try{
$sql = "UPDATE \"".$table."\" SET $fields $wheresql";
if($this->db->exec($sql))
{
return true;
}else{
return false;
}
}catch (Exception $e) {
if($this->product)
{
return false;
}else{
echo 'Caught exception: '. $e->getMessage(). "\n";
}
}
}else{
try{
$sql = "UPDATE \"".$table."\" SET $fields $wheresql";
return $this->db->exec($sql);
}catch (Exception $e) {
if($this->product)
{
return false;
}else{
echo "<pre>";
echo $sql."\r\n";
echo 'Caught exception: '. $e->getMessage(). "\r\n";
echo "</pre>";
}
}
}
}//update
}

2
application/models/helper/view.php
View File

@ -30,6 +30,8 @@ class view extends Zend_Controller_Plugin_Abstract
{
if($url == -1){
$html.= '<script language="javascript">setTimeout("window.history.back(-1);",3000);</script>'."\r\n";
}elseif($url == 0){
}else{
$html.= '<script language="javascript">setTimeout("self.location=\''.$url.'\'",3000);</script>'."\r\n";
}

4
htdocs/css/diffview.css
View File

@ -30,7 +30,9 @@ or implied, of Chas Emerick.
table.diff {
border-collapse:collapse;
border:1px solid darkgray;
white-space:pre-wrap
white-space:pre-wrap;break-all;
word-wrap: break-word;
word-break:break-all;
}
table.diff tbody {
font-family:Courier, monospace

5
htdocs/css/index.css
View File

@ -137,4 +137,7 @@
.featured-image{
max-width:100%;
overflow:hidden;
}
}
#main-news{height:330px;overflow-y:auto;}
.item{height:330px;}
hr{margin:0 auto;}

2
htdocs/plugins/upload_json.php
View File

@ -23,7 +23,7 @@ $ext_arr = array(
'image' => array('gif', 'jpg', 'jpeg', 'png', 'bmp'),
'flash' => array('swf', 'flv'),
'media' => array('swf', 'flv', 'mp3', 'wav', 'wma', 'wmv', 'mid', 'avi', 'mpg', 'asf', 'rm', 'rmvb'),
'file' => array('doc', 'docx', 'xls', 'xlsx', 'ppt', 'htm', 'html', 'txt', 'zip', 'rar', 'gz', 'bz2'),
'file' => array('doc', 'docx', 'xls', 'xlsx', 'ppt', 'htm', 'html', 'txt', 'zip', 'rar', 'gz', 'bz2','pdf'),
);
//最大文件大小
$max_size = 1000000;