diff --git a/config/filter.php b/config/filter.php index 608a43b9eb..f72375062a 100755 --- a/config/filter.php +++ b/config/filter.php @@ -479,7 +479,7 @@ $filter->sso->login->get['sessionid'] = 'reg::base64'; $filter->sso->logout->get['status'] = 'code'; $filter->sso->logout->get['token'] = 'reg::md5'; -$filter->upgrade->license->get['agree'] = 'equal::true'; +$filter->upgrade->license->get['agree'] = 'equal::1'; $filter->user->export->cookie['checkedItem'] = 'reg::checked'; $filter->user->login->cookie['keepLogin'] = 'equal::on'; @@ -560,4 +560,4 @@ $filter->convert->mapjira2zentao->cookie['jiraRelation'] = 'reg::any'; $filter->admin->register->cookie['zentaosid'] = 'reg::any'; $filter->admin->getcaptcha->cookie['zentaosid'] = 'reg::any'; $filter->admin->sendcode->cookie['zentaosid'] = 'reg::any'; -$filter->admin->giftpackage->cookie['zentaosid'] = 'reg::any'; \ No newline at end of file +$filter->admin->giftpackage->cookie['zentaosid'] = 'reg::any'; diff --git a/module/common/lang/de.php b/module/common/lang/de.php index 1ad0bb1f54..3179017ca0 100644 --- a/module/common/lang/de.php +++ b/module/common/lang/de.php @@ -50,7 +50,7 @@ $lang->collapseMenu = 'Collapse Menu'; $lang->preference = 'Preference'; $lang->tutorialAB = 'Tutorial'; $lang->runInfo = "
Time %s MS, Memory %s KB, Query %s.
"; -$lang->agreement = "I have read and agreed to the terms and conditions. Without authorization, I should not remove, hide or cover any logos/links of ZenTao."; +$lang->agreement = "I have read and agreed to the terms and conditions. Without authorization, I should not remove, hide or cover any logos/links of ZenTao."; $lang->designedByAIUX = "
AIUX
"; $lang->bizVersion = 'Testen Sie ZenTao Biz für mehr Informationen!'; $lang->bizVersionINT = 'Testen Sie ZenTao Biz für mehr Informationen!'; diff --git a/module/common/lang/en.php b/module/common/lang/en.php index 30fccec73e..71295557d6 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -50,7 +50,7 @@ $lang->collapseMenu = 'Collapse'; $lang->preference = 'Preference'; $lang->tutorialAB = 'Tutorial'; $lang->runInfo = "
Time %s MS, Memory %s KB, Query %s.
"; -$lang->agreement = "I have read and agreed to the terms and conditions. Without authorization, I should not remove, hide or cover any logos/links of ZenTao."; +$lang->agreement = "I have read and agreed to the terms and conditions. Without authorization, I should not remove, hide or cover any logos/links of ZenTao."; $lang->designedByAIUX = "
AIUX
"; $lang->bizVersion = 'Try ZenTao Biz for more!'; $lang->bizVersionINT = 'Try ZenTao Biz for more!'; diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php index 5693905d17..e4790f0326 100644 --- a/module/common/lang/fr.php +++ b/module/common/lang/fr.php @@ -50,7 +50,7 @@ $lang->collapseMenu = 'Collapse Menu'; $lang->preference = 'Preference'; $lang->tutorialAB = 'Tutorial'; $lang->runInfo = "
Time %s MS, Memory %s KB, Query %s.
"; -$lang->agreement = "I have read and agreed to the terms and conditions. Without authorization, I should not remove, hide or cover any logos/links of ZenTao."; +$lang->agreement = "I have read and agreed to the terms and conditions. Without authorization, I should not remove, hide or cover any logos/links of ZenTao."; $lang->designedByAIUX = "
AIUX
"; $lang->bizVersion = 'Essayez ZenTao Biz pour en savoir plus!'; $lang->bizVersionINT = 'Essayez ZenTao Biz pour en savoir plus!'; diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index 39f2b557a2..74c9256333 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -50,7 +50,7 @@ $lang->collapseMenu = '收起导航'; $lang->preference = '个性化设置'; $lang->tutorialAB = '使用教程'; $lang->runInfo = "
时间: %s 毫秒, 内存: %s KB, 查询: %s.
"; -$lang->agreement = "已阅读并同意。未经许可，不得去除、隐藏或遮掩禅道软件的任何标志及链接。"; +$lang->agreement = "已阅读并同意。未经许可，不得去除、隐藏或遮掩禅道软件的任何标志及链接。"; $lang->designedByAIUX = "
艾体验设计
"; $lang->bizVersion = '更多精彩，尽在企业版！'; $lang->bizVersionINT = '更多精彩，尽在企业版！'; diff --git a/module/common/lang/zh-tw.php b/module/common/lang/zh-tw.php index 44ccaad3ae..eee267d5e9 100644 --- a/module/common/lang/zh-tw.php +++ b/module/common/lang/zh-tw.php @@ -43,7 +43,7 @@ $lang->collapseMenu = '收起導航'; $lang->preference = '個性化設置'; $lang->tutorialAB = '使用教程'; $lang->runInfo = "
時間: %s 毫秒, 內存: %s KB, 查詢: %s.
"; -$lang->agreement = "已閲讀並同意《Z PUBLIC LICENSE授權協議1.2》。未經許可，不得去除、隱藏或遮掩禪道軟件的任何標誌及連結。"; +$lang->agreement = "已閲讀並同意。未經許可，不得去除、隱藏或遮掩禪道軟件的任何標誌及連結。"; $lang->designedByAIUX = "
艾體驗設計
"; $lang->reset = '重填'; diff --git a/module/upgrade/control.php b/module/upgrade/control.php index 72acca6db3..aed8c95fec 100644 --- a/module/upgrade/control.php +++ b/module/upgrade/control.php @@ -41,12 +41,13 @@ class upgrade extends control * 授权协议页面。 * Check agree license. * + * @param int $agree * @access public * @return void */ - public function license() + public function license(int $agree = 0) { - if($this->get->agree == true) $this->locate(inlink('backup')); + if($agree == 1) $this->locate(inlink('backup')); $this->view->title = $this->lang->upgrade->common; $this->view->license = $this->loadModel('install')->getLicense(); diff --git a/module/upgrade/js/license.ui.js b/module/upgrade/js/license.ui.js index f555bd5bb1..a1ceef024b 100644 --- a/module/upgrade/js/license.ui.js +++ b/module/upgrade/js/license.ui.js @@ -9,12 +9,10 @@ function agreeChange(event) { if($(event.target).prop('checked')) { - $('.btn-install').attr('href', confirmLink); - $('.btn-install').removeClass('disabled'); + $('#confirm').removeClass('disabled').attr('href', $.createLink('upgrade', 'license', 'agree=1')); } else { - $('.btn-install').removeAttr('href'); - $('.btn-install').addClass('disabled'); + $('#confirm').addClass('disabled').removeAttr('href'); } } diff --git a/module/upgrade/lang/de.php b/module/upgrade/lang/de.php index b2d8d8cdba..cefe1548b3 100644 --- a/module/upgrade/lang/de.php +++ b/module/upgrade/lang/de.php @@ -11,13 +11,13 @@ */ global $config; $lang->upgrade->common = 'Upgrade'; +$lang->upgrade->welcome = 'Willkommen zum Upgrade auf Zen Tao'; $lang->upgrade->start = 'Start'; $lang->upgrade->result = 'Ergebnis'; $lang->upgrade->fail = 'Fehlgeschlagen'; $lang->upgrade->successTip = 'Successed'; $lang->upgrade->success = 'Erfolgreich'; $lang->upgrade->tohome = 'Home'; -$lang->upgrade->license = 'Zentao PMS nutzt jetzt Z PUBLIC LICENSE(ZPL) 1.2.'; $lang->upgrade->warnning = 'Warnung!'; $lang->upgrade->checkExtension = 'Erweiterung prüfen'; $lang->upgrade->consistency = 'Check Consistency'; diff --git a/module/upgrade/lang/en.php b/module/upgrade/lang/en.php index b165f218ed..4b067aede9 100644 --- a/module/upgrade/lang/en.php +++ b/module/upgrade/lang/en.php @@ -10,14 +10,14 @@ * @link https://www.zentao.net */ global $config; -$lang->upgrade->common = 'Update'; +$lang->upgrade->common = 'Upgrade'; +$lang->upgrade->welcome = 'Welcome to upgrade ZenTao'; $lang->upgrade->start = 'Start'; $lang->upgrade->result = 'Result'; $lang->upgrade->fail = 'Failed'; $lang->upgrade->successTip = 'Successed'; $lang->upgrade->success = "

Congratulations! Your ZenTao is updated.

"; $lang->upgrade->tohome = 'Visit ZenTao'; -$lang->upgrade->license = 'ZenTao is under Z PUBLIC LICENSE(ZPL) 1.2.'; $lang->upgrade->warnning = 'Warning!'; $lang->upgrade->checkExtension = 'Check Extensions'; $lang->upgrade->consistency = 'Check Consistency'; diff --git a/module/upgrade/lang/fr.php b/module/upgrade/lang/fr.php index 94b60a08ef..b34f889d2f 100644 --- a/module/upgrade/lang/fr.php +++ b/module/upgrade/lang/fr.php @@ -11,13 +11,13 @@ */ global $config; $lang->upgrade->common = 'Mise à jour'; +$lang->upgrade->welcome = 'Bienvenue dans la mise à niveau vers Zen Tao'; $lang->upgrade->start = 'Start'; $lang->upgrade->result = 'Résultat'; $lang->upgrade->fail = 'Echec'; $lang->upgrade->successTip = 'Mise à jour effectuée'; $lang->upgrade->success = 'Mise à jour effectuée'; $lang->upgrade->tohome = 'Visitez ZenTao'; -$lang->upgrade->license = 'ZenTao est sous Z PUBLIC LICENSE(ZPL) 1.2.'; $lang->upgrade->warnning = 'Attention!'; $lang->upgrade->checkExtension = 'Vérifiez Extensions'; $lang->upgrade->consistency = 'Vérifiez Consistence'; diff --git a/module/upgrade/lang/zh-cn.php b/module/upgrade/lang/zh-cn.php index 46c0e30155..a8278d7f2d 100644 --- a/module/upgrade/lang/zh-cn.php +++ b/module/upgrade/lang/zh-cn.php @@ -11,13 +11,13 @@ */ global $config; $lang->upgrade->common = '升级'; +$lang->upgrade->welcome = '欢迎升级禅道'; $lang->upgrade->start = '开始'; $lang->upgrade->result = '升级结果'; $lang->upgrade->fail = '升级失败'; $lang->upgrade->successTip = '升级成功'; $lang->upgrade->success = "

恭喜您！您的禅道已经成功升级。

"; $lang->upgrade->tohome = '访问禅道'; -$lang->upgrade->license = '禅道项目管理软件已更换授权协议至 Z PUBLIC LICENSE(ZPL) 1.2'; $lang->upgrade->warnning = '警告'; $lang->upgrade->checkExtension = '检查插件'; $lang->upgrade->consistency = '一致性检查'; diff --git a/module/upgrade/lang/zh-tw.php b/module/upgrade/lang/zh-tw.php index 97893d465d..f08356baac 100644 --- a/module/upgrade/lang/zh-tw.php +++ b/module/upgrade/lang/zh-tw.php @@ -10,13 +10,13 @@ * @link https://www.zentao.net */ $lang->upgrade->common = '升級'; +$lang->upgrade->welcome = '歡迎升級禪道'; $lang->upgrade->start = '開始'; $lang->upgrade->result = '升級結果'; $lang->upgrade->fail = '升級失敗'; $lang->upgrade->successTip = '升級成功'; $lang->upgrade->success = "

恭喜您！

您的禪道已經成功升級。

"; $lang->upgrade->tohome = '訪問禪道'; -$lang->upgrade->license = '禪道項目管理軟件已更換授權協議至 Z PUBLIC LICENSE(ZPL) 1.2'; $lang->upgrade->warnning = '警告'; $lang->upgrade->checkExtension = '檢查插件'; $lang->upgrade->consistency = '一致性檢查'; diff --git a/module/upgrade/ui/license.html.php b/module/upgrade/ui/license.html.php index 0c63a6a3f9..98d19f0039 100644 --- a/module/upgrade/ui/license.html.php +++ b/module/upgrade/ui/license.html.php @@ -12,51 +12,40 @@ namespace zin; set::zui(true); -jsVar('confirmLink', inlink('license', 'agree=true')); - div ( - setID('main'), - div + setStyle(['padding' => '3rem 4rem', 'height' => '100vh', 'overflow' => 'hidden']), + col ( - setID('mainContent'), - setClass('px-1 mt-2 mx-auto'), - width('1200px'), - panel + setClass('container rounded-md bg-white h-full gap-5'), + setStyle(['padding' => '1.5rem 2rem']), + div ( - setClass('py-8 px-2'), - set::title($lang->upgrade->license), - set::titleClass('text-xl'), - set::actions(array()), - h::textarea + setClass('text-xl font-medium'), + $lang->upgrade->welcome + ), + div + ( + setClass('pre rounded-md bg-gray-100 overflow-x-hidden overflow-y-scroll px-8 py-6 h-full'), + setStyle('height', 'calc(100% - 8rem)'), + $license + ), + checkbox + ( + on::change('agreeChange'), + set::primary(false), + set::checked(true), + html($lang->agreement) + ), + div + ( + setClass('center'), + a ( - setClass('form-control'), - setStyle(array('background-color' => 'unset')), - set::rows('10'), - set::readonly('readonly'), - $license - ), - div - ( - setClass('mt-2 mb-2'), - checkbox - ( - on::change('agreeChange'), - set::primary(false), - set::checked(true), - html($lang->agreement) - ) - ), - div - ( - setClass('text-center mt-6'), - btn - ( - setClass('px-8 btn-install'), - set::url(inlink('license', 'agree=true')), - set::type('primary'), - $lang->confirm - ) + setID('confirm'), + setClass('btn primary w-24'), + set::href(inlink('license', 'agree=1')), + $lang->confirm ) ) )