diff --git a/Makefile b/Makefile index 81caf0d9d0..944e1c9320 100644 --- a/Makefile +++ b/Makefile @@ -105,6 +105,7 @@ zentaoxx: sed -i 's/v\.//g' zentaoxx/module/client/js/checkupgrade.js sed -i 's/xxb_/zt_/g' zentaoxx/db/*.sql mkdir zentaoxx/tools; cp tools/cn2tw.php zentaoxx/tools; cd zentaoxx/tools; php cn2tw.php + cp tools/en2de.php zentaoxx/tools; cd zentaoxx/tools; php en2de.php ../ rm -rf zentaoxx/tools zip -rqm -9 zentaoxx.$(VERSION).zip zentaoxx/* rm -rf xuan.zip xuan zentaoxx diff --git a/doc/CHANGELOG b/doc/CHANGELOG index db0f9985ca..89289360d6 100644 --- a/doc/CHANGELOG +++ b/doc/CHANGELOG @@ -124,6 +124,7 @@ 4068 用例等待评审翻译调整 4067 用例不需要评审翻译调整 4066 用户性别添加的时候不要使用缩写 + 2019-06-26 11.5.2 完善登录禅道弱口令检查 增加禅道安全性 diff --git a/module/common/lang/menuOrder.php b/module/common/lang/menuOrder.php index 5923b7debe..a6d5e9e360 100644 --- a/module/common/lang/menuOrder.php +++ b/module/common/lang/menuOrder.php @@ -66,8 +66,9 @@ $lang->qa->menuOrder[10] = 'index'; $lang->qa->menuOrder[15] = 'bug'; $lang->qa->menuOrder[20] = 'testcase'; $lang->qa->menuOrder[25] = 'testtask'; -$lang->qa->menuOrder[30] = 'testsuite'; -$lang->qa->menuOrder[35] = 'testreport'; +$lang->qa->menuOrder[30] = 'report'; +$lang->qa->menuOrder[35] = 'testsuite'; +$lang->qa->menuOrder[40] = 'caselib'; $lang->bug->menuOrder = $lang->qa->menuOrder; $lang->testcase->menuOrder = $lang->bug->menuOrder; $lang->testtask->menuOrder = $lang->testcase->menuOrder; diff --git a/module/editor/control.php b/module/editor/control.php index 7b0dbb817b..abd341c701 100644 --- a/module/editor/control.php +++ b/module/editor/control.php @@ -16,7 +16,7 @@ class editor extends control parent::__construct($moduleName, $methodName, $appName); $remoteIP = helper::getRemoteIp(); - if($remoteIP != '127.0.0.1') die("{$this->lang->editor->onlyLocalVisit}"); + if($remoteIP != '127.0.0.1') die($this->display('editor', 'deny')); } /** diff --git a/module/editor/view/deny.html.php b/module/editor/view/deny.html.php new file mode 100644 index 0000000000..59a8eaef4c --- /dev/null +++ b/module/editor/view/deny.html.php @@ -0,0 +1,18 @@ + + * @package editor + * @version $Id$ + * @link http://www.zentao.net + */ +?> + +
+
lang->editor->onlyLocalVisit;?>
+
+ + diff --git a/module/project/view/build.html.php b/module/project/view/build.html.php index 8a1192bc50..7765724589 100644 --- a/module/project/view/build.html.php +++ b/module/project/view/build.html.php @@ -38,8 +38,8 @@ - + @@ -50,13 +50,10 @@ $builds):?> - $build):?> - - - +
build->product;?> build->id;?>build->product;?> build->name;?> build->scmPath;?> build->filePath;?>
productName;?> id"), sprintf('%03d', $build->id));?>productName;?> branchName) echo "{$build->branchName}"?> createLink('build', 'view', "build=$build->id"), $build->name);?> diff --git a/module/translate/control.php b/module/translate/control.php index a88db64ec0..2a95f7eaac 100644 --- a/module/translate/control.php +++ b/module/translate/control.php @@ -27,7 +27,7 @@ class translate extends control if($remoteIP != '127.0.0.1') { $this->app->loadLang('editor'); - die("{$this->lang->editor->onlyLocalVisit}"); + die($this->display('translate', 'deny')); } } diff --git a/module/translate/view/deny.html.php b/module/translate/view/deny.html.php new file mode 100644 index 0000000000..0eba9f5fe5 --- /dev/null +++ b/module/translate/view/deny.html.php @@ -0,0 +1,18 @@ + + * @package editor + * @version $Id$ + * @link http://www.zentao.net + */ +?> + +
+
lang->editor->onlyLocalVisit;?>
+
+ + diff --git a/tools/en2de.php b/tools/en2de.php new file mode 100755 index 0000000000..69eafa3471 --- /dev/null +++ b/tools/en2de.php @@ -0,0 +1,23 @@ +#!/usr/bin/env php +