From bf16a12c7b24a2f56da946fccd750054f8717fa1 Mon Sep 17 00:00:00 2001 From: zenggang Date: Sat, 9 Oct 2021 01:05:07 +0000 Subject: [PATCH 1/3] * Fix bug#15439 --- module/install/control.php | 5 +++-- module/install/lang/de.php | 6 ++++-- module/install/lang/en.php | 6 ++++-- module/install/lang/fr.php | 6 ++++-- module/install/lang/vi.php | 6 ++++-- module/install/lang/zh-cn.php | 6 ++++-- module/install/lang/zh-tw.php | 6 ++++-- module/install/view/step6.html.php | 5 ++++- 8 files changed, 31 insertions(+), 15 deletions(-) diff --git a/module/install/control.php b/module/install/control.php index dc85248f91..1be52803a3 100644 --- a/module/install/control.php +++ b/module/install/control.php @@ -233,10 +233,11 @@ class install extends control */ public function step6() { - $this->view->title = $this->lang->install->success; + $delInstallFile = unlink($this->app->getAppRoot() . 'www/install.php'); + $this->view->delInstallFile = $delInstallFile; + $this->view->title = $this->lang->install->success; $this->display(); - unlink($this->app->getAppRoot() . 'www/install.php'); unlink($this->app->getAppRoot() . 'www/upgrade.php'); unset($_SESSION['installing']); session_destroy(); diff --git a/module/install/lang/de.php b/module/install/lang/de.php index 1a3a9a0f04..0b5cbc09de 100644 --- a/module/install/lang/de.php +++ b/module/install/lang/de.php @@ -174,8 +174,10 @@ $lang->install->success = "Installiert!"; $lang->install->login = 'Login ZenTao'; $lang->install->register = 'Bei ZenTao registieren'; -$lang->install->joinZentao = <<Sie haben ZenTao %s installiert. Bitte löschen Sie die install.php schnellstmöglich.

Hinweis: Wenn Sie über ZenTao informiert bleiben möchten, registieren Sie sich bitte unter (www.zentao.pm).

+$lang->install->successLabel = "

Sie haben ZenTao %s installiert.

"; +$lang->install->successNoticeLabel = "

Sie haben ZenTao %s installiert. Bitte löschen Sie die install.php schnellstmöglich.

"; +$lang->install->joinZentao = <<Hinweis: Wenn Sie über ZenTao informiert bleiben möchten, registieren Sie sich bitte unter (www.zentao.pm).

EOT; $lang->install->product = array('chanzhi', 'zdoo'); diff --git a/module/install/lang/en.php b/module/install/lang/en.php index dbe7d1659d..d19fe950e9 100644 --- a/module/install/lang/en.php +++ b/module/install/lang/en.php @@ -206,8 +206,10 @@ $lang->install->success = "Installed!"; $lang->install->login = 'ZenTao Login'; $lang->install->register = 'ZenTao Community Signup'; -$lang->install->joinZentao = <<You have installed ZenTao %s. Please delete install.php.

Note: In order to get the latest news of ZenTao, please sign up on ZenTao Community(www.zentao.pm).

+$lang->install->successLabel = "

You have installed ZenTao %s.

"; +$lang->install->successNoticeLabel = "

You have installed ZenTao %s. Please delete install.php.

"; +$lang->install->joinZentao = <<Note: In order to get the latest news of ZenTao, please sign up on ZenTao Community(www.zentao.pm).

EOT; $lang->install->product = array('chanzhi', 'zdoo', 'ydisk', 'meshiot'); diff --git a/module/install/lang/fr.php b/module/install/lang/fr.php index bbf8912c1a..d84676a8bc 100644 --- a/module/install/lang/fr.php +++ b/module/install/lang/fr.php @@ -174,8 +174,10 @@ $lang->install->success = "Installé !"; $lang->install->login = 'Login ZenTao'; $lang->install->register = "S'enregistrer sur la Communauté ZenTao"; -$lang->install->joinZentao = <<Vous avez installé ZenTao %s. Supprimez install.php asap.

Note : Afin d'obtenir les dernières infos de ZenTao, enregistrz-vous chez ZenTao(www.zentao.pm).

+$lang->install->successLabel = "

Vous avez installé ZenTao %s.

"; +$lang->install->successNoticeLabel = "

Vous avez installé ZenTao %s. Supprimez install.php asap.

"; +$lang->install->joinZentao = <<Note : Afin d'obtenir les dernières infos de ZenTao, enregistrz-vous chez ZenTao(www.zentao.pm).

EOT; $lang->install->product = array('chanzhi', 'zdoo'); diff --git a/module/install/lang/vi.php b/module/install/lang/vi.php index cf9fecff08..839e17700f 100644 --- a/module/install/lang/vi.php +++ b/module/install/lang/vi.php @@ -174,8 +174,10 @@ $lang->install->success = "Đã được cài đặt!"; $lang->install->login = 'Đăng nhập ZenTao'; $lang->install->register = 'Đăng ký cộng đồng ZenTao'; -$lang->install->joinZentao = <<Bạn đã cài đặt ZenTao %s. Vui lòng xóa install.php.

Chú ý: Để nhận tin tức mới nhất về ZenTao, vui lòng đăng ký trên Cộng đồng ZenTao(www.zentao.pm).

+$lang->install->successLabel = "

Bạn đã cài đặt ZenTao %s.

"; +$lang->install->successNoticeLabel = "

Bạn đã cài đặt ZenTao %s. Vui lòng xóa install.php.

"; +$lang->install->joinZentao = <<Chú ý: Để nhận tin tức mới nhất về ZenTao, vui lòng đăng ký trên Cộng đồng ZenTao(www.zentao.pm).

EOT; $lang->install->product = array('chanzhi', 'zdoo', 'ydisk', 'meshiot'); diff --git a/module/install/lang/zh-cn.php b/module/install/lang/zh-cn.php index ab9eaae020..955091b3db 100644 --- a/module/install/lang/zh-cn.php +++ b/module/install/lang/zh-cn.php @@ -206,8 +206,10 @@ $lang->install->success = "安装成功"; $lang->install->login = '登录禅道管理系统'; $lang->install->register = '禅道社区注册'; -$lang->install->joinZentao = <<您已经成功安装禅道管理系统%s，请及时删除install.php。

友情提示：为了您及时获得禅道的最新动态，请在禅道社区(www.zentao.net)进行登记。

+$lang->install->successLabel = "

您已经成功安装禅道管理系统%s。

"; +$lang->install->successNoticeLabel = "

您已经成功安装禅道管理系统%s，请及时删除install.php。

"; +$lang->install->joinZentao = <<友情提示：为了您及时获得禅道的最新动态，请在禅道社区(www.zentao.net)进行登记。

EOT; $lang->install->product = array('chanzhi', 'zdoo', 'xuanxuan', 'ydisk', 'meshiot'); diff --git a/module/install/lang/zh-tw.php b/module/install/lang/zh-tw.php index fef154d534..3fb715d23d 100644 --- a/module/install/lang/zh-tw.php +++ b/module/install/lang/zh-tw.php @@ -206,8 +206,10 @@ $lang->install->success = "安裝成功"; $lang->install->login = '登錄禪道管理系統'; $lang->install->register = '禪道社區註冊'; -$lang->install->joinZentao = <<您已經成功安裝禪道管理系統%s，請及時刪除install.php。

友情提示：為了您及時獲得禪道的最新動態，請在禪道社區(www.zentao.net)進行登記。

+$lang->install->successLabel = "

您已經成功安裝禪道管理系統%s。

"; +$lang->install->successNoticeLabel = "

您已經成功安裝禪道管理系統%s，請及時刪除install.php。

"; +$lang->install->joinZentao = <<友情提示：為了您及時獲得禪道的最新動態，請在禪道社區(www.zentao.net)進行登記。

EOT; $lang->install->product = array('chanzhi', 'zdoo', 'xuanxuan', 'ydisk', 'meshiot'); diff --git a/module/install/view/step6.html.php b/module/install/view/step6.html.php index 150486533f..e2ac520d4b 100644 --- a/module/install/view/step6.html.php +++ b/module/install/view/step6.html.php @@ -18,7 +18,10 @@
-
install->joinZentao, $config->version, $this->createLink('admin', 'register'), $this->createLink('admin', 'bind'), inlink('step6')));?>
+
+ install->successLabel : $lang->install->successNoticeLabel) . $lang->install->joinZentao;?> + version, $this->createLink('admin', 'register'), $this->createLink('admin', 'bind'), inlink('step6')));?> +
From 0b7c8943c0da3e0836e679ac1897313153004eed Mon Sep 17 00:00:00 2001 From: zenggang Date: Sat, 9 Oct 2021 09:11:02 +0000 Subject: [PATCH 2/3] * Fix bug#15438 --- module/bug/css/create.css | 1 + 1 file changed, 1 insertion(+) diff --git a/module/bug/css/create.css b/module/bug/css/create.css index 554b1268aa..433e87435a 100644 --- a/module/bug/css/create.css +++ b/module/bug/css/create.css @@ -44,3 +44,4 @@ html[lang='en'] #deadlineTd .input-group-addon {padding: 5px 18px;} #typeBox .required:after {right: 1px;} #osBox .required:after {right: 1px;} #osBox {width: 190px;} +#projectBox .required:after {right: 1px;} From e7f819ac53122a5976cbcd77e8cafc58e7d495e2 Mon Sep 17 00:00:00 2001 From: zenggang Date: Mon, 11 Oct 2021 01:16:15 +0000 Subject: [PATCH 3/3] * Adjust code variable name --- module/install/control.php | 6 +++--- module/install/view/step6.html.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/module/install/control.php b/module/install/control.php index 1be52803a3..bc6a6ae556 100644 --- a/module/install/control.php +++ b/module/install/control.php @@ -233,9 +233,9 @@ class install extends control */ public function step6() { - $delInstallFile = unlink($this->app->getAppRoot() . 'www/install.php'); - $this->view->delInstallFile = $delInstallFile; - $this->view->title = $this->lang->install->success; + $installFileDeleted = unlink($this->app->getAppRoot() . 'www/install.php'); + $this->view->installFileDeleted = $installFileDeleted; + $this->view->title = $this->lang->install->success; $this->display(); unlink($this->app->getAppRoot() . 'www/upgrade.php'); diff --git a/module/install/view/step6.html.php b/module/install/view/step6.html.php index e2ac520d4b..563e0fbf43 100644 --- a/module/install/view/step6.html.php +++ b/module/install/view/step6.html.php @@ -19,7 +19,7 @@
- install->successLabel : $lang->install->successNoticeLabel) . $lang->install->joinZentao;?> + install->successLabel : $lang->install->successNoticeLabel) . $lang->install->joinZentao;?> version, $this->createLink('admin', 'register'), $this->createLink('admin', 'bind'), inlink('step6')));?>