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

application/default/controllers/VisualController.php

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

application/default/views/scripts/data/index.phtml

@@ -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>

application/models/ApplicantPDF.php

@@ -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()

application/module/Order/Order.php

@@ -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 
+			  RIGHT JOIN normalmetadata m ON d.uuid=m.uuid WHERE d.status=2 AND d.userid=?";
-			  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=?";
 		$list = $this->db->fetchAll($sql,array($userid));
 		
 		foreach($list as $i=>$row){

application/sync.php

@@ -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";    		
-    	}
-?>