diff --git a/module/extension/control.php b/module/extension/control.php index dd873b0290..c7eca63f7f 100644 --- a/module/extension/control.php +++ b/module/extension/control.php @@ -331,4 +331,27 @@ class extension extends control $url = helper::safe64Decode($url); $this->locate($url); } + + /** + * Check the extension score + * + * @param int $score + * @param string $installUrl + * @param string $downloadUrl + * @param string $zentaoVersion + * @access public + * @return void + */ + public function checkScore($score, $installUrl, $downloadUrl, $zentaoVersion) + { + if($score) + { + $resetLink = inlink('obtain'); + $downloadUrl = helper::safe64Decode($downloadUrl); + $this->view->error = sprintf($this->lang->extension->errorCheckScore, $downloadUrl, $resetLink); + $this->view->header->title = $this->lang->extension->needScore; + die($this->display()); + } + else $this->locate(inlink('waring', "url=$installUrl&zentaoVersion=$zentaoVersion")); + } } diff --git a/module/extension/lang/zh-cn.php b/module/extension/lang/zh-cn.php index cf85390f70..979e25ee15 100644 --- a/module/extension/lang/zh-cn.php +++ b/module/extension/lang/zh-cn.php @@ -43,6 +43,7 @@ $lang->extension->byUpdatedTime = '最近更新'; $lang->extension->bySearch = '搜索'; $lang->extension->byCategory = '分类浏览'; +$lang->extension->needScore = '无法安装,需要积分'; $lang->extension->waringInstall = '安装警告:'; $lang->extension->installFailed = '安装失败,错误原因如下:'; $lang->extension->installFinished = '恭喜您,插件顺利的安装成功!'; @@ -61,6 +62,7 @@ $lang->extension->viewInstalled = '查看已安装插件'; $lang->extension->viewAvailable = '查看可安装插件'; $lang->extension->viewDeactivated = '查看已禁用插件'; +$lang->extension->errorCheckScore = '该插件下载需要积分。您要下载后进行上传安装

下载  取消

'; $lang->extension->errorCheckIncompatible = '该插件与禅道版本不兼容,安装后可能无法使用。。

是否继续,强制安装  取消

'; $lang->extension->errorDownloadPathNotFound = '插件下载存储路径%s不存在。
linux下面请执行命令:mkdir -p %s来修正。'; $lang->extension->errorDownloadPathNotWritable = '插件下载存储路径%s不可写。
linux下面请执行命令:sudo chmod 777 %s来修正。'; diff --git a/module/extension/view/checkscore.html.php b/module/extension/view/checkscore.html.php new file mode 100644 index 0000000000..8bb9eb39ff --- /dev/null +++ b/module/extension/view/checkscore.html.php @@ -0,0 +1,28 @@ + + * @package extension + * @version $Id$ + * @link http://www.zentao.net + */ +?> + + + + + + +
title;?>
+ + {$lang->extension->needSorce}"; + echo "

$error

"; + ?> + +
+ + diff --git a/module/extension/view/obtain.html.php b/module/extension/view/obtain.html.php index b3493f7dcf..423acb401b 100644 --- a/module/extension/view/obtain.html.php +++ b/module/extension/view/obtain.html.php @@ -62,8 +62,10 @@ code&downLink=" . helper::safe64Encode($extension->downLink) . "&md5=$extension->md5"); - echo html::a(inlink('waring',"url=" . helper::safe64Encode($installLink) . "&zentaoVersion=$extension->zentaoVersion"), $lang->extension->installAB, '', "class='button-c iframe'"); - echo html::a(inlink('waring',"url=" . helper::safe64Encode($extension->downLink) . "&zentaoVersion=$extension->zentaoVersion"), $lang->extension->downloadAB, '', "class='button-c iframe'"); + $downLink = substr($extension->downLink, 0, strpos($extension->downLink, '/')) . "/file-download-$extension->fileId.html"; + if(!isset($extension->score))$extension->score = 0; + echo html::a(inlink('checkScore',"score=$extension->score&installUrl=" . helper::safe64Encode($installLink) . "&downloadUrl=" . helper::safe64Encode($downLink) . "&zentaoVersion=$extension->zentaoVersion"), $lang->extension->installAB, '', "class='button-c iframe'"); + echo html::a(inlink('waring',"url=" . helper::safe64Encode($downLink) . "&zentaoVersion=$extension->zentaoVersion"), $lang->extension->downloadAB, '', "class='button-c iframe'"); ?>