From 50b7ac7516d117c14a062a2b67fea8d9b929f244 Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Wed, 26 Jun 2019 17:37:06 +0800 Subject: [PATCH] * Add code for 11.5.2. --- VERSION | 2 +- config/config.php | 2 +- doc/CHANGELOG | 6 +++++- module/common/lang/zh-tw.php | 2 +- module/misc/lang/en.php | 3 +++ module/misc/lang/zh-cn.php | 3 +++ module/misc/lang/zh-tw.php | 5 ++++- module/upgrade/lang/version.php | 1 + module/upgrade/model.php | 6 +++++- 9 files changed, 24 insertions(+), 6 deletions(-) diff --git a/VERSION b/VERSION index 326ba189b4..16ae142e9b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -11.5.1 +11.5.2 diff --git a/config/config.php b/config/config.php index 6a1c4c5b54..9639589ad9 100644 --- a/config/config.php +++ b/config/config.php @@ -16,7 +16,7 @@ if(!class_exists('config')){class config{}} if(!function_exists('getWebRoot')){function getWebRoot(){}} /* 基本设置。Basic settings. */ -$config->version = '11.5.1'; // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it. +$config->version = '11.5.2'; // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it. $config->charset = 'UTF-8'; // ZenTaoPHP的编码。 The encoding of ZenTaoPHP. $config->cookieLife = time() + 2592000; // Cookie的生存时间。The cookie life time. $config->timezone = 'Asia/Shanghai'; // 时区设置。 The time zone setting, for more see http://www.php.net/manual/en/timezones.php. diff --git a/doc/CHANGELOG b/doc/CHANGELOG index 5b6a9f1619..82691537c9 100644 --- a/doc/CHANGELOG +++ b/doc/CHANGELOG @@ -1,6 +1,10 @@ +2019-06-26 11.5.2 +完善登录禅道弱口令检查 +增加禅道安全性 +去掉二次开发编辑器模块 2019-06-24 11.5.1 完成的需求： -3708 一键安装包存在漏洞 +3708 增加一键安装包安全性 3901 增加免密登录的功能 修复的bug: 2514 用例覆盖率计算错误 diff --git a/module/common/lang/zh-tw.php b/module/common/lang/zh-tw.php index 3a62992548..f9387a4327 100644 --- a/module/common/lang/zh-tw.php +++ b/module/common/lang/zh-tw.php @@ -393,7 +393,7 @@ $lang->admin->subMenu->sso->ranzhi = '然之協同|admin|sso'; $lang->admin->subMenu->dev = new stdclass(); $lang->admin->subMenu->dev->api = array('link' => 'API|dev|api'); $lang->admin->subMenu->dev->db = array('link' => '資料庫|dev|db'); -$lang->admin->subMenu->dev->editor = array('link' => '編輯器|editor|index', 'subModule' => 'editor'); +//$lang->admin->subMenu->dev->editor = array('link' => '編輯器|editor|index', 'subModule' => 'editor'); $lang->admin->subMenu->dev->entry = array('link' => '應用|entry|browse', 'subModule' => 'entry'); $lang->admin->subMenu->data = new stdclass(); diff --git a/module/misc/lang/en.php b/module/misc/lang/en.php index faa587d031..60a065da16 100644 --- a/module/misc/lang/en.php +++ b/module/misc/lang/en.php @@ -75,6 +75,7 @@ $lang->misc->feature = new stdclass(); $lang->misc->feature->lastest = 'Latest Version'; $lang->misc->feature->detailed = 'Details'; +$lang->misc->releaseDate['11.5.2'] = '2019-06-26'; $lang->misc->releaseDate['11.5.1'] = '2019-06-24'; $lang->misc->releaseDate['11.5.stable'] = '2019-05-08'; $lang->misc->releaseDate['11.4.1'] = '2019-04-08'; @@ -103,6 +104,8 @@ $lang->misc->releaseDate['7.2.stable'] = '2015-05-22'; $lang->misc->releaseDate['7.1.stable'] = '2015-03-07'; $lang->misc->releaseDate['6.3.stable'] = '2014-11-07'; +$lang->misc->feature->all['11.5.2'][] = array('title'=>'Increase the security of ZenTao and increase the login password for weak password check', 'desc' => ''); + $lang->misc->feature->all['11.5.1'][] = array('title'=>'Add a third-party authentication and fix bugs.', 'desc' => ''); $lang->misc->feature->all['11.5.stable'][] = array('title'=>'Optimize details and fix bug.', 'desc' => ''); diff --git a/module/misc/lang/zh-cn.php b/module/misc/lang/zh-cn.php index 1aa99eab37..d34a61c731 100644 --- a/module/misc/lang/zh-cn.php +++ b/module/misc/lang/zh-cn.php @@ -75,6 +75,7 @@ $lang->misc->feature = new stdclass(); $lang->misc->feature->lastest = '最新版本'; $lang->misc->feature->detailed = '详情'; +$lang->misc->releaseDate['11.5.2'] = '2019-06-26'; $lang->misc->releaseDate['11.5.1'] = '2019-06-24'; $lang->misc->releaseDate['11.5.stable'] = '2019-05-08'; $lang->misc->releaseDate['11.4.1'] = '2019-04-08'; @@ -103,6 +104,8 @@ $lang->misc->releaseDate['7.2.stable'] = '2015-05-22'; $lang->misc->releaseDate['7.1.stable'] = '2015-03-07'; $lang->misc->releaseDate['6.3.stable'] = '2014-11-07'; +$lang->misc->feature->all['11.5.2'][] = array('title'=>'增加禅道安全性，增加登录禅道弱口令检查', 'desc' => ''); + $lang->misc->feature->all['11.5.1'][] = array('title'=>'新增第三方应用免密登录禅道，修复Bug', 'desc' => ''); $lang->misc->feature->all['11.5.stable'][] = array('title'=>'完善细节，修复Bug', 'desc' => ''); diff --git a/module/misc/lang/zh-tw.php b/module/misc/lang/zh-tw.php index 931968c1b3..5e29bb9770 100644 --- a/module/misc/lang/zh-tw.php +++ b/module/misc/lang/zh-tw.php @@ -75,6 +75,7 @@ $lang->misc->feature = new stdclass(); $lang->misc->feature->lastest = '最新版本'; $lang->misc->feature->detailed = '詳情'; +$lang->misc->releaseDate['11.5.2'] = '2019-06-26'; $lang->misc->releaseDate['11.5.1'] = '2019-06-24'; $lang->misc->releaseDate['11.5.stable'] = '2019-05-08'; $lang->misc->releaseDate['11.4.1'] = '2019-04-08'; @@ -103,7 +104,9 @@ $lang->misc->releaseDate['7.2.stable'] = '2015-05-22'; $lang->misc->releaseDate['7.1.stable'] = '2015-03-07'; $lang->misc->releaseDate['6.3.stable'] = '2014-11-07'; -$lang->misc->feature->all['11.5.1'][] = array('title'=>'新增第三方應用免密登錄，修復Bug', 'desc' => ''); +$lang->misc->feature->all['11.5.2'][] = array('title'=>'增加禪道安全性，增加登錄禪道弱口令檢查', 'desc' => ''); + +$lang->misc->feature->all['11.5.1'][] = array('title'=>'新增第三方應用免密登錄禪道，修復Bug', 'desc' => ''); $lang->misc->feature->all['11.5.stable'][] = array('title'=>'完善細節，修復Bug', 'desc' => ''); $lang->misc->feature->all['11.5.stable'][] = array('title'=>'新增動態過濾機制', 'desc' => ''); diff --git a/module/upgrade/lang/version.php b/module/upgrade/lang/version.php index d6edcadd35..5423a4d5c0 100644 --- a/module/upgrade/lang/version.php +++ b/module/upgrade/lang/version.php @@ -107,3 +107,4 @@ $lang->upgrade->fromVersions['11_3'] = '11.3'; $lang->upgrade->fromVersions['11_4'] = '11.4'; $lang->upgrade->fromVersions['11_4_1'] = '11.4.1'; $lang->upgrade->fromVersions['11_5'] = '11.5'; +$lang->upgrade->fromVersions['11_5_1'] = '11.5.1'; diff --git a/module/upgrade/model.php b/module/upgrade/model.php index 4fc5df7383..173f823c8a 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -392,6 +392,9 @@ class upgradeModel extends model case '11_5': $this->saveLogs('Execute 11_5'); $this->execSQL($this->getUpgradeFile('11.5')); + case '11_5_1': + $this->saveLogs('Execute 11_5_1'); + $this->execSQL($this->getUpgradeFile('11.5_1')); } $this->deletePatch(); @@ -533,7 +536,8 @@ class upgradeModel extends model $xuanxuanSql = $this->app->getAppRoot() . 'db' . DS . 'upgradexuanxuan2.5.0.sql'; $confirmContent .= file_get_contents($xuanxuanSql); } - case '11_5': $confirmContent .= file_get_contents($this->getUpgradeFile('11.5')); + case '11_5' : $confirmContent .= file_get_contents($this->getUpgradeFile('11.5')); + case '11_5_1' : $confirmContent .= file_get_contents($this->getUpgradeFile('11.5.1')); } return str_replace('zt_', $this->config->db->prefix, $confirmContent); }