merge heihedata branch r5110 - r5206 into trunk

application/admin/views/scripts/data/ref-add.phtml

@@ -196,7 +196,7 @@
     };
 </script>
 <?php if(isset($this->data['attid']) && !empty($this->data['attid'])){ ?>
-<input type="hidden" id="reference_file_content" value='<?= json_encode($this->data[' file']) ?>' />
+<input type="hidden" id="reference_file_content" value='<?= json_encode($this->data['file']) ?>' />
 <script>
     upload.onsuccess('', $('#reference_file_content').val(), "");
 </script>

application/module/Open/Client.php

@@ -130,17 +130,19 @@ class Client extends \Zend_Controller_Plugin_Abstract
 			$client->param['callback'] => $client->config['callback'],
 			$client->param['code'] => $code
 		);
-		
+
 		$curl = new Curl();
 		$curl->port = 443;
 		$curl->initOptions(array('verifyssl'=>false));
 		$data = $curl->request($main_url,$param,"POST");
-		
+
 		$cache_data = json_decode($data['response'],true);
-		
+
-		if(!isset($cache_data['expires_in']))
+		$userinfo = json_decode($cache_data['userInfo'],true);
+
+		if(!is_array($cache_data) || !isset($cache_data['expires_in']) || !isset($userinfo['cstnetId']))
 		{
-			return "未获得授权信息，请重试链接";
+			return "未获得授权信息，请重试链接，如果还无法登录请使用网站账号密码登录";
 		}
 		
 		return $cache_data;

application/module/Open/Handler/ClientTokenHandler/Escience.php

@@ -66,8 +66,11 @@ class Escience
 		{
 			return "参数错误";
 		}
-		
+
-		$this->userInfo = json_decode($tokenData['userInfo'],true);
+		if(is_array($tokenData['userInfo']))
+			$this->userInfo = $tokenData['userInfo'];
+		else
+			$this->userInfo = json_decode($tokenData['userInfo'],true);
 		
 		unset($tokenData['userInfo']);