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

Merge branch 'master' of https://github.com/easysoft/zentaopms

Browse Source
This commit is contained in:
reneeteng
2019-07-15 14:43:13 +08:00
parent 8507b22977 29a97a4f1c
commit 0fc983d890
9 changed files with 68 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+1
View File
@@ -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
doc/CHANGELOG
+1
View File
@@ -124,6 +124,7 @@
4068 用例等待评审翻译调整
4067 用例不需要评审翻译调整
4066 用户性别添加的时候不要使用缩写
2019-06-26 11.5.2
完善登录禅道弱口令检查
增加禅道安全性
module/common/lang/menuOrder.php
+3 -2
View File
@@ -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;
module/editor/control.php
+1 -1
View File
@@ -16,7 +16,7 @@ class editor extends control
parent::__construct($moduleName, $methodName, $appName);
$remoteIP = helper::getRemoteIp();
if($remoteIP != '127.0.0.1') die("<html><head><meta chatset='utf-8'></head><body>{$this->lang->editor->onlyLocalVisit}</body></html>");
if($remoteIP != '127.0.0.1') die($this->display('editor', 'deny'));
}
/**
module/editor/view/deny.html.php
+18
View File
@@ -0,0 +1,18 @@
<?php
/**
* The deny view file of editor module of ZenTaoPMS.
*
* @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
* @license ZPL (http://zpl.pub/page/zplv12.html)
* @author Yidong Wang <yidong@cnezsoft.com>
* @package editor
* @version $Id$
* @link http://www.zentao.net
*/
?>
<?php include '../../dev/view/header.html.php';?>
<div id='mainContent' class='main-content'>
<div class='alert alert-warning'><?php echo $this->lang->editor->onlyLocalVisit;?></div>
</div>
<?php include '../../common/view/footer.html.php';?>
module/project/view/build.html.php
+2 -5
View File
@@ -38,8 +38,8 @@
<table class="table text-center" id='buildList'>
<thead>
<tr>
<th class="w-200px text-left"><?php echo $lang->build->product;?></th>
<th class="c-id-sm"><?php echo $lang->build->id;?></th>
<th class="w-200px text-left"><?php echo $lang->build->product;?></th>
<th class="c-name text-left"><?php echo $lang->build->name;?></th>
<th class="c-url"><?php echo $lang->build->scmPath;?></th>
<th class="c-url"><?php echo $lang->build->filePath;?></th>
@@ -50,13 +50,10 @@
</thead>
<tbody>
<?php foreach($projectBuilds as $productID => $builds):?>
<?php $total = count($builds);?>
<?php foreach($builds as $index => $build):?>
<tr data-id="<?php echo $productID;?>">
<?php if($index == 0):?>
<td rowspan="<?php echo $total;?>" class="text-left" title='<?php echo $build->productName;?>'><?php echo $build->productName;?></td>
<?php endif;?>
<td class="c-id-sm text-muted"><?php echo html::a(helper::createLink('build', 'view', "buildID=$build->id"), sprintf('%03d', $build->id));?></td>
<td class="text-left" title='<?php echo $build->productName;?>'><?php echo $build->productName;?></td>
<td class="c-name">
<?php if($build->branchName) echo "<span class='label label-outline label-badge'>{$build->branchName}</span>"?>
<?php echo html::a($this->createLink('build', 'view', "build=$build->id"), $build->name);?>
module/translate/control.php
+1 -1
View File
@@ -27,7 +27,7 @@ class translate extends control
if($remoteIP != '127.0.0.1')
{
$this->app->loadLang('editor');
die("<html><head><meta chatset='utf-8'></head><body>{$this->lang->editor->onlyLocalVisit}</body></html>");
die($this->display('translate', 'deny'));
}
}
module/translate/view/deny.html.php
+18
View File
@@ -0,0 +1,18 @@
<?php
/**
* The deny view file of editor module of ZenTaoPMS.
*
* @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
* @license ZPL (http://zpl.pub/page/zplv12.html)
* @author Yidong Wang <yidong@cnezsoft.com>
* @package editor
* @version $Id$
* @link http://www.zentao.net
*/
?>
<?php include '../../common/view/header.html.php';?>
<div id='mainContent' class='main-content'>
<div class='alert alert-warning'><?php echo $this->lang->editor->onlyLocalVisit;?></div>
</div>
<?php include '../../common/view/footer.html.php';?>
tools/en2de.php
Executable
+23
View File
@@ -0,0 +1,23 @@
#!/usr/bin/env php
<?php
/* Set the extpath and cconv binary. */
if(empty($argv[1])) die("Must give the module path.\n");
$extPath = $argv[1];
foreach(glob("$extPath/module/*") as $moduleName)
{
/* Convert the main lang file. */
$moduleLangPath = realpath($moduleName) . '/lang/';
$defaultLangFile = $moduleLangPath . 'en.php';
$targetLangFile = $moduleLangPath . 'de.php';
if(file_exists($defaultLangFile)) system("cp -r $defaultLangFile $targetLangFile");
/* Convert the extened lang file. */
foreach(glob("$moduleName/ext/lang/en/*.php") as $extLangFile)
{
$pathOfTW = dirname(dirname($extLangFile)) . "/de";
$extFileName = basename($extLangFile);
if(!is_dir($pathOfTW)) mkdir($pathOfTW);
system("cp -r $extLangFile $pathOfTW/$extFileName");
}
}