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

merge sanjiangyuan-sub branch r4855 - r4867 into sjy-emc

This commit is contained in:
wlx 2014-06-23 05:06:05 +00:00
parent 53c01a9568 0526231290
commit 61c4ead29c
7 changed files with 123 additions and 172 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
application/default/controllers/VisualController.php
View File

@ -15,14 +15,12 @@ class VisualController extends Zend_Controller_Action
array('link'=>'/data','title'=>$this->view->config->title->data),
);
$auth = Zend_Auth::getInstance();
if($auth->hasIdentity())
if(view::User() === false)
{
$user = $auth->getIdentity();
$this->uid = $user->id;
}else{
$this->_redirect('/account/login?href=/visual');
view::Post($this,"请先登陆",'/account/login?href='.urlencode($_SERVER['REQUEST_URI']));
}
$this->uid = view::User('id');
}
function indexAction()

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

@ -60,7 +60,7 @@
<h4>数据最近更新 <a href="/service/feed" target="_blank"><i class="icon-rss"></i></a></h4>
<ul class="unstyled">
<?php foreach($this->metadata as $md) : ?>
<li><a href="/data/<?php echo $md['uuid'];?>"><i class="icon-map-marker"> </i><?php echo $this->escape($md['title']);?></a><small class="pull-right">[<?= date('Y-m-d',strtotime($md['ts_created'])) ?>]</small></li>
<li><a href="/data/<?php echo $md['uuid'];?>"><i class="icon-map-marker"> </i><?php echo $this->escape($md['title']);?></a> <small>[<?= date('Y-m-d',strtotime($md['ts_created'])) ?>]</small></li>
<?php endforeach; ?>
</ul>
</div>

14
application/models/ApplicantPDF.php
View File

@ -25,7 +25,7 @@ class ApplicantPDF extends FPDI
$this->addPage();
$this->useTemplate($tplidx);
$this->SetFont('ugb','',$this->fontsize);
$this->setXY(74,43);
$this->setXY(86,41.5);
$this->Write($this->fontsize,$this->data['realname']);
$this->SetXY(34,55);
$this->MultiCell (166, 4, str_replace(";","\n",$this->data['westdclist']));
@ -33,18 +33,18 @@ class ApplicantPDF extends FPDI
$this->MultiCell(166,4,trim($this->data['project']));
//$this->setXY(34,239);
//$this->Write($this->fontsize,$this->data['realname']);
$this->setXY(32,223);
$this->setXY(32,222);
$this->Write($this->fontsize,$this->data['unit']);
$this->setXY(112,223);
$this->setXY(112,222);
$this->Write($this->fontsize,$this->data['email']);
$this->setXY(174,223);
$this->setXY(174,222);
$this->Write($this->fontsize,$this->data['postcode']);
$this->setXY(32,230);
$this->setXY(32,228);
$this->Write($this->fontsize,$this->data['address']);
$this->setXY(112,230);
$this->setXY(112,228);
$this->Write($this->fontsize,$this->data['phone']);
$t=date("Y-m-d");
$this->setXY(174,230);
$this->setXY(174,228);
$this->Write($this->fontsize,$t);
}
function drawHeihe()

12
application/module/Order/Order.php
View File

@ -312,17 +312,7 @@ class Order
public function pdfPrint($formData,$userid = 0,$save = false,$returnpdf = false)
{
$sql="SELECT m.title||'('||m.filesize::text||'MB)' as title FROM dataorder d
RIGHT JOIN heihemetadata m ON d.uuid=m.uuid
WHERE d.status=2 AND d.userid=?";
$list = $this->db->fetchAll($sql,array($userid));
foreach($list as $i=>$row){
@$formData['heihelist'].=($i+1).". ".$row['title'].";";
}
$sql="SELECT m.title||'('||m.filesize::text||'MB)' as title FROM dataorder d
RIGHT JOIN normalmetadata m ON d.uuid=m.uuid WHERE d.uuid not in (select uuid from heihemetadata) AND d.status=2 AND d.userid=?";
RIGHT JOIN normalmetadata m ON d.uuid=m.uuid WHERE d.status=2 AND d.userid=?";
$list = $this->db->fetchAll($sql,array($userid));
foreach($list as $i=>$row){

37
application/sync.php
View File

@ -1,37 +0,0 @@
<?php
//sync seekspace data
error_reporting(E_ALL|E_STRICT);
ini_set('display_errors', 1);
date_default_timezone_set('Asia/Shanghai');
// directory setup and class loading
set_include_path('.' . PATH_SEPARATOR . '../include/'
. PATH_SEPARATOR . '../application/models'
. PATH_SEPARATOR . '../application/default/controllers'
. PATH_SEPARATOR . get_include_path());
include "Zend/Loader.php";
Zend_Loader::registerAutoload();
$config = new Zend_Config_Ini('config.ini', 'general');
$db = Zend_Db::factory($config->db);
Zend_Db_Table::setDefaultAdapter($db);
$sql="select item_id,title from knl_article";
$rs=$db->fetchAll($sql);
foreach($rs as $r)
{
$sql="select item_id,place,keyword from knl_keyword where item_id=?";
$rs1=$db->fetchAll($sql,array($r['item_id']));
foreach($rs1 as $r1)
{
$sql="update knl_article set keywords[?]=? where item_id=?";
$db->query($sql,array($r1['place'],$r1['keyword'],$r1['item_id']));
}
$sql="select item_id,place,author from knl_author where item_id=?";
$rs1=$db->fetchAll($sql,array($r['item_id']));
foreach($rs1 as $r1)
{
$sql="update knl_article set authors[?]=? where item_id=?";
$db->query($sql,array($r1['place'],$r1['author'],$r1['item_id']));
}
print $r['title']."...\n";
}
?>

BIN
data/offline.pdf
View File

Binary file not shown.

BIN
data/security.pdf
View File

Binary file not shown.