Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* fix bug for snoopy.

Browse Source
This commit is contained in:
wangyidong
2018-09-28 10:44:26 +08:00
parent 2d25ad825a
commit fdea2bca27
3 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/extension/lang/en.php
+1 -1
View File
@@ -99,7 +99,7 @@ $lang->extension->waring = 'Warning!';
$lang->extension->errorOccurs = 'Error:';
$lang->extension->errorGetModules = 'Get Extension Category from www.zentao.net failed. It could be network error. Plase check your network and refresh it.';
$lang->extension->errorGetExtensions = 'Get Extension from www.zentao.net failed. It could be network error. Please go to <a href="http://www.zentao.net/extension/" target="_blank" class="alert-link">www.zentao.net</a> and download the extension, and then upload it to install.';
$lang->extension->errorGetExtensions = 'Get Extension from www.zentao.net failed. It could be network error. Please go to <a href="https://www.zentao.net/extension/" target="_blank" class="alert-link">www.zentao.net</a> and download the extension, and then upload it to install.';
$lang->extension->errorDownloadPathNotFound = 'Extension download path <strong>%s</strong> is not found.<br /> Please run <strong>mkdir -p %s</strong> in Linux to fix it.';
$lang->extension->errorDownloadPathNotWritable = 'Extensiond ownload path <strong>%s</strong>is not writable. <br />Please run <strong>sudo chmod 777 %s</strong> in Linux to fix it.';
$lang->extension->errorPackageFileExists = '<strong>%s</strong> has existed in the download path.<h5> Please %s it again, <a href="%s" class="alert-link">CLICK HERE</a></h5>';
module/extension/lang/zh-cn.php
+1 -1
View File
@@ -99,7 +99,7 @@ $lang->extension->waring = '警告';
$lang->extension->errorOccurs = '错误：';
$lang->extension->errorGetModules = '从www.zentao.net获得插件分类失败。可能是因为网络方面的原因，请检查后重新刷新页面。';
$lang->extension->errorGetExtensions = '从www.zentao.net获得插件失败。可能是因为网络方面的原因，您可以到 <a href="http://www.zentao.net/extension/" target="_blank" class="alert-link">www.zentao.net</a> 手工下载插件，然后上传安装。';
$lang->extension->errorGetExtensions = '从www.zentao.net获得插件失败。可能是因为网络方面的原因，您可以到 <a href="https://www.zentao.net/extension/" target="_blank" class="alert-link">www.zentao.net</a> 手工下载插件，然后上传安装。';
$lang->extension->errorDownloadPathNotFound = '插件下载存储路径<strong>%s</strong>不存在。<br />linux下面请执行命令：<strong>mkdir -p %s</strong>来修正。';
$lang->extension->errorDownloadPathNotWritable = '插件下载存储路径<strong>%s</strong>不可写。<br />linux下面请执行命令：<strong>sudo chmod 777 %s</strong>来修正。';
$lang->extension->errorPackageFileExists = '下载路径已经有一个名为的<strong>%s</strong>附件。<h5>重新%s，<a href="%s" class="alert-link">请点击此链接</a></h5>';
module/install/model.php
+4 -7
View File
@@ -60,14 +60,11 @@ class installModel extends model
public function getLatestRelease()
{
if(!function_exists('json_decode')) return false;
$result = common::http('http://www.zentao.net/misc-getlatestrelease.json');
if($result)
$snoopy = $this->app->loadClass('snoopy');
if(@$snoopy->fetchText('https://www.zentao.net/misc-getlatestrelease.json'))
{
$result = json_decode($result);
if(isset($result->release) and $this->config->version != $result->release->version)
{
return $result->release;
}
$result = json_decode($snoopy->results);
if(isset($result->release) and $this->config->version != $result->release->version) return $result->release;
}
return false;
}