From a0548058e5f3d07033f190852ce7085d225d87e0 Mon Sep 17 00:00:00 2001 From: caoyanyi Date: Thu, 17 Mar 2022 10:52:40 +0800 Subject: [PATCH 1/2] * Fix bug #12206. --- module/upgrade/css/afterexec.css | 2 ++ module/upgrade/view/afterexec.html.php | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/module/upgrade/css/afterexec.css b/module/upgrade/css/afterexec.css index ce2d6b6123..3dd0eb71dd 100644 --- a/module/upgrade/css/afterexec.css +++ b/module/upgrade/css/afterexec.css @@ -69,3 +69,5 @@ .card.ad > .card-reveal > .card-heading {padding: 12px 10px 10px 15px;} .card.ad > .card-reveal {color: #333;} .card.ad > .card-reveal li {line-height: 1.5; font-size: 12px;} + +.result-box {height: 400px; position: fixed; left: 50%; top: 50%; margin-left: -400px; margin-top: -200px;} diff --git a/module/upgrade/view/afterexec.html.php b/module/upgrade/view/afterexec.html.php index 055c0bd04d..de9a29cb27 100644 --- a/module/upgrade/view/afterexec.html.php +++ b/module/upgrade/view/afterexec.html.php @@ -11,7 +11,7 @@ ?>
-
+
upgrade->result;?>
From d8c594e873e46ee2021fe850ba4b883e03c5c780 Mon Sep 17 00:00:00 2001 From: caoyanyi Date: Thu, 17 Mar 2022 13:58:15 +0800 Subject: [PATCH 2/2] * Fix bug 12342. --- module/backup/control.php | 3 ++- module/extension/control.php | 7 ++++--- module/extension/lang/en.php | 5 +++-- module/extension/lang/zh-cn.php | 5 +++-- xuanxuan/extension/xuan/client/ext/control/create.php | 5 +++-- xuanxuan/extension/xuan/client/ext/control/edit.php | 5 +++-- 6 files changed, 18 insertions(+), 12 deletions(-) diff --git a/module/backup/control.php b/module/backup/control.php index 40f081973d..8f4756b051 100644 --- a/module/backup/control.php +++ b/module/backup/control.php @@ -336,7 +336,8 @@ class backup extends control if($statusFile) { $this->app->loadLang('extension'); - $this->view->error = sprintf($this->lang->extension->noticeOkFile, str_replace(dirname($this->app->getBasePath()) . DS, '', $statusFile)); + $statusFile = str_replace(dirname($this->app->getBasePath()) . DS, '', $statusFile); + $this->view->error = sprintf($this->lang->extension->noticeOkFile, $statusFile, $statusFile); return print($this->display()); } diff --git a/module/extension/control.php b/module/extension/control.php index 9e33d8707d..8057c874f8 100644 --- a/module/extension/control.php +++ b/module/extension/control.php @@ -29,7 +29,8 @@ class extension extends control $this->view->title = $this->lang->extension->browse; $this->view->position[] = $this->lang->extension->browse; - $this->view->error = sprintf($this->lang->extension->noticeOkFile, str_replace('\\', '/', $statusFile)); + $statusFile = str_replace('\\', '/', $statusFile); + $this->view->error = sprintf($this->lang->extension->noticeOkFile, $statusFile, $statusFile); $this->display('extension', 'safe'); helper::end(); } @@ -148,7 +149,7 @@ class extension extends control $statusFile = $this->loadModel('common')->checkSafeFile(); if($statusFile) { - $this->view->error = sprintf($this->lang->extension->noticeOkFile, $statusFile); + $this->view->error = sprintf($this->lang->extension->noticeOkFile, $statusFile, $statusFile); return $this->display(); } /* Get the package file name. */ @@ -421,7 +422,7 @@ class extension extends control $statusFile = $this->loadModel('common')->checkSafeFile(); if($statusFile) { - $this->view->error = sprintf($this->lang->extension->noticeOkFile, $statusFile); + $this->view->error = sprintf($this->lang->extension->noticeOkFile, $statusFile, $statusFile); return $this->display(); } diff --git a/module/extension/lang/en.php b/module/extension/lang/en.php index f71276b187..b8e7b030c4 100644 --- a/module/extension/lang/en.php +++ b/module/extension/lang/en.php @@ -92,13 +92,14 @@ $lang->extension->viewInstalled = 'Installed Extensions'; $lang->extension->viewAvailable = 'Available Extensions'; $lang->extension->viewDeactivated = 'Deactivated Extensions'; $lang->extension->backDBFile = 'This extension data has been backed up to %s!'; -$lang->extension->noticeOkFile = '
For security reasons, your Admin account has to be confirmed.
+$lang->extension->noticeOkFile = "
For security reasons, your Admin account has to be confirmed.
Plese login your ZenTao server and create %s.
+

Execute command: echo '' > %s

Note

  1. The file you will create is empty.
  2. If such file exists, delete it first, and then create one.
    3. -
'; + "; $lang->extension->upgradeExt = 'Upgrade'; $lang->extension->installExt = 'Install'; diff --git a/module/extension/lang/zh-cn.php b/module/extension/lang/zh-cn.php index 483c43346f..09fd3255db 100644 --- a/module/extension/lang/zh-cn.php +++ b/module/extension/lang/zh-cn.php @@ -92,13 +92,14 @@ $lang->extension->viewInstalled = '查看已安装插件'; $lang->extension->viewAvailable = '查看可安装插件'; $lang->extension->viewDeactivated = '查看已禁用插件'; $lang->extension->backDBFile = '插件相关数据已经备份到 %s 文件中！'; -$lang->extension->noticeOkFile = '
为了安全起见，系统需要确认您的管理员身份
+$lang->extension->noticeOkFile = "
为了安全起见，系统需要确认您的管理员身份
请登录禅道所在的服务器，创建%s文件。
+

可以执行命令：echo '' > %s

注意：

  1. 文件内容为空。
  2. 如果之前文件存在，删除之后重新创建。
    3. -
'; + "; $lang->extension->upgradeExt = '升级'; $lang->extension->installExt = '安装'; diff --git a/xuanxuan/extension/xuan/client/ext/control/create.php b/xuanxuan/extension/xuan/client/ext/control/create.php index 8d64dd544f..79cd3a62de 100644 --- a/xuanxuan/extension/xuan/client/ext/control/create.php +++ b/xuanxuan/extension/xuan/client/ext/control/create.php @@ -8,8 +8,9 @@ class myClient extends client if($statusFile) { $this->app->loadLang('extension'); - $this->view->error = sprintf($this->lang->extension->noticeOkFile, str_replace('\\', '/', $statusFile)); - die($this->display('client', 'safe')); + $statusFile = str_replace('\\', '/', $statusFile); + $this->view->error = sprintf($this->lang->extension->noticeOkFile, $statusFile, $statusFile); + return print($this->display('client', 'safe')); } if($_POST) $_POST['desc'] = mb_substr($this->post->desc, 0, 100); diff --git a/xuanxuan/extension/xuan/client/ext/control/edit.php b/xuanxuan/extension/xuan/client/ext/control/edit.php index 901786cc57..98d4324069 100644 --- a/xuanxuan/extension/xuan/client/ext/control/edit.php +++ b/xuanxuan/extension/xuan/client/ext/control/edit.php @@ -8,8 +8,9 @@ class myClient extends client if($statusFile) { $this->app->loadLang('extension'); - $this->view->error = sprintf($this->lang->extension->noticeOkFile, str_replace('\\', '/', $statusFile)); - die($this->display('client', 'safe')); + $statusFile = str_replace('\\', '/', $statusFile); + $this->view->error = sprintf($this->lang->extension->noticeOkFile, $statusFile, $statusFile); + return print($this->display('client', 'safe')); } if($_POST) $_POST['desc'] = mb_substr($this->post->desc, 0, 100);