merge heihedata branch r5110 - r5206 into trunk

This commit is contained in:
wlx 2015-01-31 03:59:50 +00:00
parent 62e50fb6ea
commit a4ddb0a87b
5 changed files with 14 additions and 9 deletions

View File

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

View File

@ -138,9 +138,11 @@ class Client extends \Zend_Controller_Plugin_Abstract
$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;

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

File diff suppressed because one or more lines are too long